summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43/sdio.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-11-29 11:19:09 -0800
committerDavid S. Miller <davem@davemloft.net>2010-11-29 11:19:09 -0800
commit77148625e10d0fda50d05e92d199c0df17b66e9a (patch)
treefdb5bb1e06933dc8891a3c4d3c93c371801d8b37 /drivers/net/wireless/b43/sdio.c
parenta41778694806ac1ccd4b1dafed1abef8d5ba98ac (diff)
parent51cce8a590c4696d62bfacc63378d1036084cef7 (diff)
downloadblackbird-op-linux-77148625e10d0fda50d05e92d199c0df17b66e9a.tar.gz
blackbird-op-linux-77148625e10d0fda50d05e92d199c0df17b66e9a.zip
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/b43/sdio.c')
-rw-r--r--drivers/net/wireless/b43/sdio.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/sdio.c b/drivers/net/wireless/b43/sdio.c
index 9a55338d957f..09e2dfd7b175 100644
--- a/drivers/net/wireless/b43/sdio.c
+++ b/drivers/net/wireless/b43/sdio.c
@@ -163,6 +163,7 @@ static int b43_sdio_probe(struct sdio_func *func,
err_free_ssb:
kfree(sdio);
err_disable_func:
+ sdio_claim_host(func);
sdio_disable_func(func);
err_release_host:
sdio_release_host(func);
OpenPOWER on IntegriCloud