diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2019-06-17 13:28:12 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2019-06-17 13:28:12 +0200 |
| commit | 163367c952e7dc9ae7c286bf4a42d0cbe974d7f7 (patch) | |
| tree | b3e675e62f5dd5ff1635e1f8638c8fc1fa06390d /drivers/mmc/core/mmc.c | |
| parent | 1accbced1c3273ead1d30de14339c4a39062bee0 (diff) | |
| parent | 20314ce30af197963b0c239f0952db6aaef73f99 (diff) | |
| download | lwn-163367c952e7dc9ae7c286bf4a42d0cbe974d7f7.tar.gz lwn-163367c952e7dc9ae7c286bf4a42d0cbe974d7f7.zip | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc/core/mmc.c')
| -rw-r--r-- | drivers/mmc/core/mmc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 3e786ba204c3..671bfcceea6a 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1212,13 +1212,13 @@ static int mmc_select_hs400(struct mmc_card *card) mmc_set_timing(host, MMC_TIMING_MMC_HS400); mmc_set_bus_speed(card); + if (host->ops->hs400_complete) + host->ops->hs400_complete(host); + err = mmc_switch_status(card); if (err) goto out_err; - if (host->ops->hs400_complete) - host->ops->hs400_complete(host); - return 0; out_err: |