diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
| commit | 4b7bd364700d9ac8372eff48832062b936d0793b (patch) | |
| tree | 0dbf78c95456a0b02d07fcd473281f04a87e266d /drivers/net/wireless/b43 | |
| parent | c0d8768af260e2cbb4bf659ae6094a262c86b085 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge branch 'master' into for-next
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.c
Needed to update to apply fixes for which the old branch was too
outdated.
Diffstat (limited to 'drivers/net/wireless/b43')
| -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, | |||
| 163 | err_free_ssb: | 163 | err_free_ssb: |
| 164 | kfree(sdio); | 164 | kfree(sdio); |
| 165 | err_disable_func: | 165 | err_disable_func: |
| 166 | sdio_claim_host(func); | ||
| 166 | sdio_disable_func(func); | 167 | sdio_disable_func(func); |
| 167 | err_release_host: | 168 | err_release_host: |
| 168 | sdio_release_host(func); | 169 | sdio_release_host(func); |