MMC host:

- sdhci-of-at91: Don't overwrite quirk flags
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEugLDXPmKSktSkQsV/iaEJXNYjCkFAl3OXRsXHHVsZi5oYW5z
 c29uQGxpbmFyby5vcmcACgkQ/iaEJXNYjClXKRAAuJKECtXVeB+93gbS1YOSuuiP
 KVJtuDpH+KX4V/BgiZrsvgIy7cu6Fyr80wyh/M9GF0Gy1BKPdWcPUqk15VdiZJmS
 albuXA7Ncvl7ATfF8izWiG2QK05iQRAowd8fLCbpWgexo1JSyWEujnLOe4iapE1L
 YOcVQOMuTqoc0S/8QbEd680LiEbYwGeGPbJ2VT3EbAleZ7EJgR14Oj69Arwd4Oro
 hOKu8PHUBGLq7R64fMU+4qCjUOpUPeIF6kgGaXbmDnHK2e+hTMYcIxoVAin2GtnG
 F8lYkRwV2K1chg7L94RiXEYtkntNkTMQt2lto4QNB4nDTAzOEWmXxbxTCKDuXQl6
 Po5hr66aBa3Za5Cb6s3Wxu52J2GxszxaqHfeaztYwGFGzDiPY9oLxNqLGilpbOkq
 O1zlfkGGY3MOU/+pts8hDl7sU6mV/tGwXC6spebcKyeap0OVMmQxyrXu7B9RquYk
 LCnrrXnYiDB1NgJ2u6VjNI1jcxAjf+zlG9l0gm1QQJHmlTVMeQcv6hY/lir15j+3
 /Bc28k2681jcOQac4KAjSFCZkivq61ksJ69GIqB4EBySqcHLZGp6JX6TWiUkd/rh
 XeOJonSJikGIsXaziNKh3ZfQ9zlhiYrYc4BfxWsV/buUhiwQgneTpOY+CGPs7xCy
 UwXbs4/gqgT2vuccvQc=
 =hvlm
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2019-11-15 08:58:56 -08:00
commit 5b675f7362

View File

@ -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)