Merge branch 'fixes' into next
This commit is contained in:
commit
99a934443d
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user