mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-28 23:24:50 +00:00
Code Issues Releases Wiki Activity

wl12xx: fix SDIO suspend/resume

Browse source 
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>
This commit is contained in:
Eyal Shapira 2011-11-08 15:56:55 +02:00 committed by Luciano Coelho
parent c31e494689
commit b693289406
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/wireless/wl12xx/sdio.c
View file

@ -289,7 +289,8 @@ static int wl1271_suspend(struct device *dev)
/* Tell MMC/SDIO core it's OK to power down the card /* Tell MMC/SDIO core it's OK to power down the card
* (if it isn't already), but not to remove it completely */ * (if it isn't already), but not to remove it completely */
struct sdio_func *func = dev_to_sdio_func(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);
mmc_pm_flag_t sdio_flags; mmc_pm_flag_t sdio_flags;
int ret = 0; int ret = 0;
@ -324,7 +325,8 @@ static int wl1271_suspend(struct device *dev)
static int wl1271_resume(struct device *dev) static int wl1271_resume(struct device *dev)
{ {
struct sdio_func *func = dev_to_sdio_func(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"); dev_dbg(dev, "wl1271 resume\n");
if (wl->wow_enabled) { if (wl->wow_enabled) {