diff options
author | David S. Miller <davem@davemloft.net> | 2010-11-24 09:16:14 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-24 09:16:14 -0800 |
commit | 66fc5dff5e4f82c92723202a5de9bdec16a9331f (patch) | |
tree | 4c9d2e740db2316d73c1e6bed3d6bb08cb052a73 /drivers/net/wireless/b43/sdio.c | |
parent | 9915672d41273f5b77f1b3c29b391ffb7732b84b (diff) | |
parent | e476a5a41ad67d0e2b4a652820c49a3923eb936b (diff) | |
download | blackbird-obmc-linux-66fc5dff5e4f82c92723202a5de9bdec16a9331f.tar.gz blackbird-obmc-linux-66fc5dff5e4f82c92723202a5de9bdec16a9331f.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/b43/sdio.c')
-rw-r--r-- | drivers/net/wireless/b43/sdio.c | 1 |
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); |