Commit 5b675f73 authored Nov 15, 2019 by Linus Torvalds

Merge tag 'mmc-v5.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC fix from Ulf Hansson:
 "Don't overwrite quirk flags in sdhci-of-at91 host driver"

* tag 'mmc-v5.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-of-at91: fix quirk2 overwrite

parents 11ac7cc8 fed23c58

drivers/mmc/host/sdhci-of-at91.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -358,7 +358,7 @@ static int sdhci_at91_probe(struct platform_device *pdev)
		pm_runtime_use_autosuspend(&pdev->dev);

		/* HS200 is broken at this moment */
		host->quirks2 = SDHCI_QUIRK2_BROKEN_HS200;
		host->quirks2 \|= SDHCI_QUIRK2_BROKEN_HS200;

		ret = sdhci_add_host(host);
		if (ret)

Admin message