[PATCH] wl12xx: fix SDIO suspend/resume

[PATCH] wl12xx: fix SDIO suspend/resume

[Eyal Shapira]

wl1271_suspend/resume() accessed the wrong struct and not wl1271
which caused it to think that wow was enabled when it wasn't.

Signed-off-by: Eyal Shapira <eyal@wizery.com>
---
 drivers/net/wireless/wl12xx/sdio.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/wl12xx/sdio.c b/drivers/net/wireless/wl12xx/sdio.c
index ed97f9c..468a505 100644
--- a/drivers/net/wireless/wl12xx/sdio.c
+++ b/drivers/net/wireless/wl12xx/sdio.c
@@ -289,7 +289,8 @@ static int wl1271_suspend(struct device *dev)
 	/* Tell MMC/SDIO core it's OK to power down the card
 	 * (if it isn't already), but not to remove it completely */
 	struct sdio_func *func = dev_to_sdio_func(dev);
-	struct wl1271 *wl = sdio_get_drvdata(func);
+	struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func);
+	struct wl1271 *wl = platform_get_drvdata(glue->core);
 	mmc_pm_flag_t sdio_flags;
 	int ret = 0;
 
@@ -324,7 +325,8 @@ out:
 static int wl1271_resume(struct device *dev)
 {
 	struct sdio_func *func = dev_to_sdio_func(dev);
-	struct wl1271 *wl = sdio_get_drvdata(func);
+	struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func);
+	struct wl1271 *wl = platform_get_drvdata(glue->core);
 
 	dev_dbg(dev, "wl1271 resume\n");
 	if (wl->wow_enabled) {
-- 
1.7.4.1

Re: [PATCH] wl12xx: fix SDIO suspend/resume

[Luciano Coelho]

On Tue, 2011-11-08 at 15:56 +0200, Eyal Shapira wrote: 
> wl1271_suspend/resume() accessed the wrong struct and not wl1271
> which caused it to think that wow was enabled when it wasn't.
> 
> Signed-off-by: Eyal Shapira <eyal@wizery.com>
> ---

Applied.  Thanks Eyal!

-- 
Cheers,
Luca.