---

yaml --- r: 278719 b: refs/heads/master c: b693289 h: refs/heads/master i: 278717: e0db778 278715: 8eebf58 278711: c591a4a 278703: c426264 278687: 3e89450 278655: 3a79236 v: v3
git-mirror · Nov 8, 2011 · 5beb26c · 5beb26c
1 parent 1f83272
commit 5beb26c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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) {