diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-10 21:54:14 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-10 21:54:14 -0500 |
| commit | 94a06b74e724caabcf0464c81527cfbcae0c8aff (patch) | |
| tree | 3570b6a627382a5eb5c8328b4959f615544d8e62 /drivers/mmc | |
| parent | 0dde52a9f5330eec240660191a94b51bd911ffcd (diff) | |
| parent | 9062511097683b4422f023d181b4a8b2db1a7a72 (diff) | |
Merge branch 'for_2.6.39/pm-misc' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'drivers/mmc')
| -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) | |||
| 792 | */ | 792 | */ |
| 793 | mmc_release_host(host); | 793 | mmc_release_host(host); |
| 794 | err = mmc_add_card(host->card); | 794 | err = mmc_add_card(host->card); |
| 795 | mmc_claim_host(host); | ||
| 796 | if (err) | 795 | if (err) |
| 797 | goto remove_added; | 796 | goto remove_added; |
| 798 | 797 | ||
| @@ -805,12 +804,12 @@ int mmc_attach_sdio(struct mmc_host *host) | |||
| 805 | goto remove_added; | 804 | goto remove_added; |
| 806 | } | 805 | } |
| 807 | 806 | ||
| 807 | mmc_claim_host(host); | ||
| 808 | return 0; | 808 | return 0; |
| 809 | 809 | ||
| 810 | 810 | ||
| 811 | remove_added: | 811 | remove_added: |
| 812 | /* Remove without lock if the device has been added. */ | 812 | /* Remove without lock if the device has been added. */ |
| 813 | mmc_release_host(host); | ||
| 814 | mmc_sdio_remove(host); | 813 | mmc_sdio_remove(host); |
| 815 | mmc_claim_host(host); | 814 | mmc_claim_host(host); |
| 816 | remove: | 815 | remove: |