Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99a93444 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

Merge branch 'fixes' into next

parents f24483a6 0f7b79a4

drivers/mmc/host/sdhci-pci-o2micro.c

+4 −1
Original line number Diff line number Diff line
@@ -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;