summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ti/wl1251
diff options
context:
space:
mode:
authorLuciano Coelho <coelho@ti.com>2013-03-25 17:06:37 +0200
committerLuciano Coelho <coelho@ti.com>2013-03-25 17:06:37 +0200
commita373c3cec0394756f130183551214a4bd38b4103 (patch)
tree19f832d10753ec06efef753cb23ec97f886f8903 /drivers/net/wireless/ti/wl1251
parent0d4e67174b03e3dcfe75ce7ec488770a5d443bf4 (diff)
parent97236a0656034ef8512ded648cfaa3d7282534e8 (diff)
Merge branch 'wl12xx-next' into for-linville
Diffstat (limited to 'drivers/net/wireless/ti/wl1251')
-rw-r--r--drivers/net/wireless/ti/wl1251/sdio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index e57ee48edff..e2b3d9c541e 100644
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
@@ -186,8 +186,10 @@ static int wl1251_sdio_set_power(struct wl1251 *wl, bool enable)
wl->set_power(true);
ret = pm_runtime_get_sync(&func->dev);
- if (ret < 0)
+ if (ret < 0) {
+ pm_runtime_put_sync(&func->dev);
goto out;
+ }
sdio_claim_host(func);
sdio_enable_func(func);