| Message ID | 4835546.qgzOJFlmY8@wasted.cogentembedded.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 14 October 2015 at 22:53, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> wrote: > There's little sense in releasing the host on mmc_add_card() error > immediately after reclaiming it, so reclaim the host only in case > of success. > > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Thanks, applied patch 1 and patch 2 (squashed them) for next. Kind regards Uffe > > --- > The patch is against Ulf Hansson's 'mmc.git' repo's 'next' branch. > > drivers/mmc/core/mmc.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > Index: mmc/drivers/mmc/core/mmc.c > =================================================================== > --- mmc.orig/drivers/mmc/core/mmc.c > +++ mmc/drivers/mmc/core/mmc.c > @@ -2009,14 +2009,13 @@ int mmc_attach_mmc(struct mmc_host *host > > mmc_release_host(host); > err = mmc_add_card(host->card); > - mmc_claim_host(host); > if (err) > goto remove_card; > > + mmc_claim_host(host); > return 0; > > remove_card: > - mmc_release_host(host); > mmc_remove_card(host->card); > mmc_claim_host(host); > host->card = NULL; > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: mmc/drivers/mmc/core/mmc.c =================================================================== --- mmc.orig/drivers/mmc/core/mmc.c +++ mmc/drivers/mmc/core/mmc.c @@ -2009,14 +2009,13 @@ int mmc_attach_mmc(struct mmc_host *host mmc_release_host(host); err = mmc_add_card(host->card); - mmc_claim_host(host); if (err) goto remove_card; + mmc_claim_host(host); return 0; remove_card: - mmc_release_host(host); mmc_remove_card(host->card); mmc_claim_host(host); host->card = NULL;
There's little sense in releasing the host on mmc_add_card() error immediately after reclaiming it, so reclaim the host only in case of success. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- The patch is against Ulf Hansson's 'mmc.git' repo's 'next' branch. drivers/mmc/core/mmc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html