mmc: sdhci-of-at91: fix quirk2 overwrite
Subsystems (4)
PATCH 1/1 mmc: sdhci-of-at91: fix quirk2 overwrite
From: Eugen Hristev <[email protected]>
The quirks2 are parsed and set (e.g. from DT) before the quirk for broken HS200 is set in the driver.
The driver needs to enable just this flag, not rewrite the whole quirk set.
---
drivers/mmc/host/sdhci-of-at91.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/sdhci-of-at91.c +1 -1
@@ -389,7 +389,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)
Signature · 1 line
2.7.4
Quoted 8 lines · On 14/11/19 2:59 PM, [email protected] wrote:
From: Eugen Hristev <[email protected]>
The quirks2 are parsed and set (e.g. from DT) before the quirk for broken HS200 is set in the driver.
The driver needs to enable just this flag, not rewrite the whole quirk set.Fixes 7871aa60ae00 ("mmc: sdhci-of-at91: add quirk for broken HS200")Signed-off-by Eugen Hristev <[email protected]>
Quoted 19 lines
---
drivers/mmc/host/sdhci-of-at91.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/mmc/host/sdhci-of-at91.c +1
-1@@ -389,7 +389,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)
Quoted 9 lines · On Thu, 14 Nov 2019 at 13:59, <[email protected]> wrote:
From: Eugen Hristev <[email protected]>
The quirks2 are parsed and set (e.g. from DT) before the quirk for broken HS200 is set in the driver.
The driver needs to enable just this flag, not rewrite the whole quirk set.Fixes 7871aa60ae00 ("mmc: sdhci-of-at91: add quirk for broken HS200")Signed-off-by Eugen Hristev <[email protected]>
Applied for fixes, adding a stable tag, thanks!
Kind regards
Uffe
Quoted 21 lines
---
drivers/mmc/host/sdhci-of-at91.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/mmc/host/sdhci-of-at91.c +1
-2@@ -389,7 +389,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) --2.7.4