diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-07 20:45:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-07 20:45:12 -0800 |
| commit | 1a3453035f3e55aa419aa66b7eee62ddf590c70f (patch) | |
| tree | 9092c3e188f67f66717dc26211a04cdfd2075038 /drivers | |
| parent | b44a53d1dad6ba9ed87c8b3324133ec87fe5e588 (diff) | |
| parent | 34497913f2936fd43c86b007da7224bb8e77fd15 (diff) | |
| download | linux-1a3453035f3e55aa419aa66b7eee62ddf590c70f.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
mmc: sdio: Allow sdio operations in other threads during sdio_add_func()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/core/sdio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 5c4a54d9b6a4..ebc62ad4cc56 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -792,7 +792,6 @@ int mmc_attach_sdio(struct mmc_host *host) */ mmc_release_host(host); err = mmc_add_card(host->card); - mmc_claim_host(host); if (err) goto remove_added; @@ -805,12 +804,12 @@ int mmc_attach_sdio(struct mmc_host *host) goto remove_added; } + mmc_claim_host(host); return 0; remove_added: /* Remove without lock if the device has been added. */ - mmc_release_host(host); mmc_sdio_remove(host); mmc_claim_host(host); remove: |