diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2019-06-18 13:38:49 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2019-06-18 13:38:49 +0200 |
| commit | 99a934443d9282b92f721e5d0c6ec5bdee10fbcb (patch) | |
| tree | 577763a7c63a0ba523440b45f1c6ec5c28627cb2 /drivers | |
| parent | f24483a64e425aa20178d4760f7d0349db84aeb7 (diff) | |
| parent | 0f7b79a44e7d7dd3ef1f59758c1a341f217ff5e5 (diff) | |
| download | linux-99a934443d9282b92f721e5d0c6ec5bdee10fbcb.tar.bz2 | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/sdhci-pci-o2micro.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c index b29bf4e7dcb4..dd21315922c8 100644 --- a/drivers/mmc/host/sdhci-pci-o2micro.c +++ b/drivers/mmc/host/sdhci-pci-o2micro.c @@ -115,6 +115,7 @@ static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) */ if (mmc->ios.bus_width == MMC_BUS_WIDTH_8) { current_bus_width = mmc->ios.bus_width; + mmc->ios.bus_width = MMC_BUS_WIDTH_4; sdhci_set_bus_width(host, MMC_BUS_WIDTH_4); } @@ -126,8 +127,10 @@ static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) sdhci_end_tuning(host); - if (current_bus_width == MMC_BUS_WIDTH_8) + if (current_bus_width == MMC_BUS_WIDTH_8) { + mmc->ios.bus_width = MMC_BUS_WIDTH_8; sdhci_set_bus_width(host, current_bus_width); + } host->flags &= ~SDHCI_HS400_TUNING; return 0; |