Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
mmc: sdio: fix SDIO suspend/resume regression
+13
+13
drivers/mmc/core/core.c
+13
drivers/mmc/core/core.c
···
1631
1631
if (host->bus_ops && !host->bus_dead) {
1632
1632
if (host->bus_ops->suspend)
1633
1633
err = host->bus_ops->suspend(host);
1634
+
if (err == -ENOSYS || !host->bus_ops->resume) {
1635
+
/*
1636
+
* We simply "remove" the card in this case.
1637
+
* It will be redetected on resume.
1638
+
*/
1639
+
if (host->bus_ops->remove)
1640
+
host->bus_ops->remove(host);
1641
+
mmc_claim_host(host);
1642
+
mmc_detach_bus(host);
1643
+
mmc_release_host(host);
1644
+
host->pm_flags = 0;
1645
+
err = 0;
1646
+
}
1634
1647
}
1635
1648
mmc_bus_put(host);
1636
1649