Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+8
-6
+8
-6
drivers/mmc/host/sdhci-omap.c
+8
-6
drivers/mmc/host/sdhci-omap.c
···
1298
1298
/*
1299
1299
* omap_device_pm_domain has callbacks to enable the main
1300
1300
* functional clock, interface clock and also configure the
1301
-
* SYSCONFIG register of omap devices. The callback will be invoked
1302
-
* as part of pm_runtime_get_sync.
1301
+
* SYSCONFIG register to clear any boot loader set voltage
1302
+
* capabilities before calling sdhci_setup_host(). The
1303
+
* callback will be invoked as part of pm_runtime_get_sync.
1303
1304
*/
1304
1305
pm_runtime_use_autosuspend(dev);
1305
1306
pm_runtime_set_autosuspend_delay(dev, 50);
···
1442
1441
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
1443
1442
struct sdhci_omap_host *omap_host = sdhci_pltfm_priv(pltfm_host);
1444
1443
1445
-
sdhci_runtime_suspend_host(host);
1444
+
if (omap_host->con != -EINVAL)
1445
+
sdhci_runtime_suspend_host(host);
1446
1446
1447
1447
sdhci_omap_context_save(omap_host);
1448
1448
···
1460
1458
1461
1459
pinctrl_pm_select_default_state(dev);
1462
1460
1463
-
if (omap_host->con != -EINVAL)
1461
+
if (omap_host->con != -EINVAL) {
1464
1462
sdhci_omap_context_restore(omap_host);
1465
-
1466
-
sdhci_runtime_resume_host(host, 0);
1463
+
sdhci_runtime_resume_host(host, 0);
1464
+
}
1467
1465
1468
1466
return 0;
1469
1467
}