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()
This commit is contained in:
Коммит
1a3453035f
|
@ -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:
|
||||
|
|
Загрузка…
Ссылка в новой задаче