aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2012-01-26 07:12:32 -0500
committerLuciano Coelho <coelho@ti.com>2012-02-15 01:38:30 -0500
commit1ebaa2d041746949c291fff17be9880820f70e55 (patch)
tree9c6d58e52fea84d45a808dc011381c024da89632 /drivers/net
parentb4748306368a61b64b97b16f11cb6a82eebb60f9 (diff)
wl12xx: don't release/claim sdio on suspend/resume
Since we reverted to claiming the host only when needed, we no longer need to release/claim the host on suspend/resume. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/wl12xx/sdio.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/wireless/wl12xx/sdio.c b/drivers/net/wireless/wl12xx/sdio.c
index 099c2c9c1a2d..ce3b9a99463e 100644
--- a/drivers/net/wireless/wl12xx/sdio.c
+++ b/drivers/net/wireless/wl12xx/sdio.c
@@ -324,9 +324,6 @@ static int wl1271_suspend(struct device *dev)
324 dev_err(dev, "error while trying to keep power\n"); 324 dev_err(dev, "error while trying to keep power\n");
325 goto out; 325 goto out;
326 } 326 }
327
328 /* release host */
329 sdio_release_host(func);
330 } 327 }
331out: 328out:
332 return ret; 329 return ret;
@@ -334,15 +331,7 @@ out:
334 331
335static int wl1271_resume(struct device *dev) 332static int wl1271_resume(struct device *dev)
336{ 333{
337 struct sdio_func *func = dev_to_sdio_func(dev);
338 struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func);
339 struct wl1271 *wl = platform_get_drvdata(glue->core);
340
341 dev_dbg(dev, "wl1271 resume\n"); 334 dev_dbg(dev, "wl1271 resume\n");
342 if (wl->wow_enabled) {
343 /* claim back host */
344 sdio_claim_host(func);
345 }
346 335
347 return 0; 336 return 0;
348} 337}