From 5beb26c91d4087b828340395294e64cc1f2ba41e Mon Sep 17 00:00:00 2001 From: Eyal Shapira Date: Tue, 8 Nov 2011 15:56:55 +0200 Subject: [PATCH] --- yaml --- r: 278719 b: refs/heads/master c: b693289406f0b8ca70ab77e745be6196d5740eb0 h: refs/heads/master i: 278717: e0db7781bef5be32b56ae4f50e4d3e19a435d0d6 278715: 8eebf589b59f3a32bdde6ab92719bca75e9d6d55 278711: c591a4ac81dcb83437206dd515296df7dcea8886 278703: c4262646b8da736d0d5ccbf81536846da00becd3 278687: 3e8945066a8a4ae98c18b7695e7c066d992b6819 278655: 3a79236e8f28b86a2e66711ff3af9c6d6ee07850 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/sdio.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f8d16a7f4b30..2d8a3fa42342 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c31e494689128203ef04fb946f05a72d33eee948 +refs/heads/master: b693289406f0b8ca70ab77e745be6196d5740eb0 diff --git a/trunk/drivers/net/wireless/wl12xx/sdio.c b/trunk/drivers/net/wireless/wl12xx/sdio.c index ed97f9cee3f0..468a50553fac 100644 --- a/trunk/drivers/net/wireless/wl12xx/sdio.c +++ b/trunk/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 @@ static int wl1271_suspend(struct device *dev) 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) {