summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2019-11-14 16:29:31 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2019-11-14 16:29:31 +0100
commit6ca228d1c5b98ce6b274c27225a522732263acde (patch)
tree225ee4a4c434a48e0bd27a6dfb1bbf8984cd1bb0
parentc2a93d75c0e25d3191d3f150a0a2f16b6ab4c81a (diff)
parentfed23c5829ecab4ddc712d7b0046e59610ca3ba4 (diff)
Merge branch 'fixes' into next
-rw-r--r--drivers/mmc/host/sdhci-of-at91.c2
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 9571c4a882a9..5959e394b416 100644
--- 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)