wl12xx: fix sdio_test module functionality
Due to some changes in PM in recent kernels, the sdio_test module has been broken for a while. This patch fixes the code that powers the card on and off. Also made some small indentation fixes in the Makefile. [Rephrased commit log and removed the change in the FW name, since it's done in another patch. -- Luca] Signed-off-by: Shahar Levi <shahar_levi@ti.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
This commit is contained in:
parent
6cd9d21a0c
commit
d3b104ae22
|
@ -30,6 +30,7 @@
|
||||||
#include <linux/mmc/sdio_func.h>
|
#include <linux/mmc/sdio_func.h>
|
||||||
#include <linux/mmc/sdio_ids.h>
|
#include <linux/mmc/sdio_ids.h>
|
||||||
#include <linux/mmc/card.h>
|
#include <linux/mmc/card.h>
|
||||||
|
#include <linux/mmc/host.h>
|
||||||
#include <linux/gpio.h>
|
#include <linux/gpio.h>
|
||||||
#include <linux/wl12xx.h>
|
#include <linux/wl12xx.h>
|
||||||
#include <linux/kthread.h>
|
#include <linux/kthread.h>
|
||||||
|
@ -142,14 +143,23 @@ static int wl1271_sdio_set_power(struct wl1271 *wl, bool enable)
|
||||||
ret = pm_runtime_get_sync(&func->dev);
|
ret = pm_runtime_get_sync(&func->dev);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
/* Runtime PM might be disabled, power up the card manually */
|
||||||
|
ret = mmc_power_restore_host(func->card->host);
|
||||||
|
if (ret < 0)
|
||||||
|
goto out;
|
||||||
|
|
||||||
sdio_claim_host(func);
|
sdio_claim_host(func);
|
||||||
sdio_enable_func(func);
|
sdio_enable_func(func);
|
||||||
sdio_release_host(func);
|
|
||||||
} else {
|
} else {
|
||||||
sdio_claim_host(func);
|
|
||||||
sdio_disable_func(func);
|
sdio_disable_func(func);
|
||||||
sdio_release_host(func);
|
sdio_release_host(func);
|
||||||
|
|
||||||
|
/* Runtime PM might be disabled, power off the card manually */
|
||||||
|
ret = mmc_power_save_host(func->card->host);
|
||||||
|
if (ret < 0)
|
||||||
|
goto out;
|
||||||
|
|
||||||
/* Power down the card */
|
/* Power down the card */
|
||||||
ret = pm_runtime_put_sync(&func->dev);
|
ret = pm_runtime_put_sync(&func->dev);
|
||||||
}
|
}
|
||||||
|
@ -433,7 +443,6 @@ static int __devinit wl1271_probe(struct sdio_func *func,
|
||||||
|
|
||||||
sdio_set_drvdata(func, wl_test);
|
sdio_set_drvdata(func, wl_test);
|
||||||
|
|
||||||
|
|
||||||
/* power up the device */
|
/* power up the device */
|
||||||
ret = wl1271_chip_wakeup(wl);
|
ret = wl1271_chip_wakeup(wl);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
|
|
Loading…
Reference in New Issue