Merge branch 'fixes' into next

6ca228d1 · Ulf Hansson · c2a93d75 · fed23c58 · 6ca228d1
Commit 6ca228d1 authored Nov 14, 2019 by Ulf Hansson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/drivers/mmc/host/sdhci-of-at91.c
+++ b/drivers/mmc/host/sdhci-of-at91.c
@@ -377,7 +377,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)