Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-21 07:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

MMC host:

Browse Source 
- sdhci-omap: Fix a lockdep warning while probing
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEugLDXPmKSktSkQsV/iaEJXNYjCkFAmLacVgXHHVsZi5oYW5z
 c29uQGxpbmFyby5vcmcACgkQ/iaEJXNYjClwqQ/9HqGnN8sPyDpFLT06hMcU/34N
 Pz8imDCjL4LsQ3oUElf91xcFjr2oozWtDdWEkVoHumEPJ/jLWGX51jgpjDmq50De
 i4/kLUYmOuYSgbhwkXjrmrs/lJrqad0vwBzuspkuQkjxuISO6nUZZYZr5vqDo77B
 iYj33zu1F4KTo7HJ3mo0ChaZ7+hDTVkrGFtjLE7BHJB/B/HAlxIPuE3R+Ym7eWvM
 eWsoJrcbncz2n4kBBUERurxzi2CfDr1BojgL9aW78JHtsaNVs8X+IqW/AHUxzm1N
 UY1ckqiCbqDMGFhLjfZmgsCdhxB4iYS8EBzxqP9BcefqIC54+nUl4qtqS4pYv5nA
 Te2fNuOpCUrFPd+tvLqT7qJJf72LhOlgxi6MqPGH3GWR1rJTp7Rf/KjK9Z3oe0Km
 lHN6f4eRL5Hp7i7nsBBU12XrZcBn2SNbvK/wDVOLYp9czQ7mhoIoXfg6rrB2rCv2
 nQ3R5BZpNey0gOgqWxieaGGtHf/5pzRMZOJnrN3serjKFefhMUojyYAc/aqLPaLO
 afUV6OzdRgxn6hei4aoKUseRTP1BnoZoQXxEuEdZ2S0ROJdZytM7WV/5V6gjuWkR
 7T+pkfyfiOKJ/5SCRuMLFmMX/DVMkI47vK6AykyDNq4m6vdxcN6zxOont/hp51lF
 /iwGKVzrqA3NLG98YM0=
 =7KWw
 -----END PGP SIGNATURE-----

Merge tag 'mmc-v5.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC fix from Ulf Hansson:

 - sdhci-omap: Fix a lockdep warning while probing

* tag 'mmc-v5.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-omap: Fix a lockdep warning for PM runtime init
This commit is contained in:
Linus Torvalds 2022-07-22 12:14:13 -07:00
commit 85029503fc
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/mmc/host/sdhci-omap.c
View File

@ -1298,8 +1298,9 @@ static int sdhci_omap_probe(struct platform_device *pdev)
/*
* omap_device_pm_domain has callbacks to enable the main
* functional clock, interface clock and also configure the
* SYSCONFIG register of omap devices. The callback will be invoked
* as part of pm_runtime_get_sync.
* SYSCONFIG register to clear any boot loader set voltage
* capabilities before calling sdhci_setup_host(). The
* callback will be invoked as part of pm_runtime_get_sync.
*/
pm_runtime_use_autosuspend(dev);
pm_runtime_set_autosuspend_delay(dev, 50);
@ -1441,7 +1442,8 @@ static int __maybe_unused sdhci_omap_runtime_suspend(struct device *dev)
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
struct sdhci_omap_host *omap_host = sdhci_pltfm_priv(pltfm_host);
sdhci_runtime_suspend_host(host);
if (omap_host->con != -EINVAL)
sdhci_runtime_suspend_host(host);
sdhci_omap_context_save(omap_host);
@ -1458,10 +1460,10 @@ static int __maybe_unused sdhci_omap_runtime_resume(struct device *dev)
pinctrl_pm_select_default_state(dev);
if (omap_host->con != -EINVAL)
if (omap_host->con != -EINVAL) {
sdhci_omap_context_restore(omap_host);
sdhci_runtime_resume_host(host, 0);
sdhci_runtime_resume_host(host, 0);
}
return 0;
}