diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-04-10 16:39:27 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-10 16:39:27 +0200 |
| commit | d3641409a05dcb8e28116bb2ad638f5a42805d9d (patch) | |
| tree | 1d43a5e0129709502edb631a4fd66de369ee5620 /drivers/net/wireless/ti/wl1251 | |
| parent | tg3: Use bool not int (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-d3641409a05dcb8e28116bb2ad638f5a42805d9d.tar.xz linux-d3641409a05dcb8e28116bb2ad638f5a42805d9d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/rt2x00/rt2x00pci.c
net/mac80211/sta_info.c
net/wireless/core.h
Diffstat (limited to 'drivers/net/wireless/ti/wl1251')
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/sdio.c | 4 |
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 e57ee48edff6..e2b3d9c541e8 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); |