diff options
| author | Eyal Shapira <eyal@wizery.com> | 2011-11-08 15:56:55 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-11-08 16:00:35 +0200 |
| commit | b693289406f0b8ca70ab77e745be6196d5740eb0 (patch) | |
| tree | b082f846a5af6dc6507c56b116f269858050bfd1 /drivers/net/wireless/wl12xx | |
| parent | c31e494689128203ef04fb946f05a72d33eee948 (diff) | |
| download | blackbird-obmc-linux-b693289406f0b8ca70ab77e745be6196d5740eb0.tar.gz blackbird-obmc-linux-b693289406f0b8ca70ab77e745be6196d5740eb0.zip | |
wl12xx: fix SDIO suspend/resume
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>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx')
| -rw-r--r-- | 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 ed97f9cee3f0..468a50553fac 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) { |
