diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-10 17:23:56 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-10 17:23:55 -0700 |
| commit | b5149e3db646b3676eb82441332e71612fbc0b27 (patch) | |
| tree | 9ac0334cbad18b992c4fc1d62514e76327959f7c | |
| parent | 9630f91b23215de2cb71901279dc0fc3720f11af (diff) | |
| parent | bd7cf09fbe0d1dbe7dec9d3427ef8cfa28e0e5e7 (diff) | |
Merge "mmc: core: fix bus-width selection in HS400 mode"
| -rw-r--r-- | drivers/mmc/core/mmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 5ab09b4ae868..3b79f514350e 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -2031,7 +2031,7 @@ reinit: err = mmc_select_hs400(card); if (err) goto free_card; - } else { + } else if (!mmc_card_hs400(card)) { /* Select the desired bus width optionally */ err = mmc_select_bus_width(card); if (!IS_ERR_VALUE(err) && mmc_card_hs(card)) { |