diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-15 08:58:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-15 08:58:56 -0800 |
| commit | 5b675f7362ba9debfd6c3e38edda197b35a29f0f (patch) | |
| tree | 5a9eb11d3adc713b99d32cc528944b01922659d1 | |
| parent | Merge tag 'sound-5.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound (diff) | |
| parent | mmc: sdhci-of-at91: fix quirk2 overwrite (diff) | |
| download | linux-dev-5b675f7362ba9debfd6c3e38edda197b35a29f0f.tar.xz linux-dev-5b675f7362ba9debfd6c3e38edda197b35a29f0f.zip | |
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
| -rw-r--r-- | drivers/mmc/host/sdhci-of-at91.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c index e7d1920729fb..0ae986c42bc8 100644 --- a/drivers/mmc/host/sdhci-of-at91.c +++ b/drivers/mmc/host/sdhci-of-at91.c @@ -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) |