diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-15 13:18:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-15 13:18:36 -0400 |
| commit | 5a2b3ef4559f3d0ef58cbfb723f528f1c6b2e601 (patch) | |
| tree | 3421b2051cec89dcdf98b71f100837698f149ade /drivers | |
| parent | c9192798b9318a4b3f96c41ae27805cc8b46b7ee (diff) | |
| parent | 1c8cf9c997a4a6b36e907c7ede5f048aeaab1644 (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/core/core.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 5db49b124ffa..09eee6df0653 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c | |||
| @@ -1631,6 +1631,19 @@ int mmc_suspend_host(struct mmc_host *host) | |||
| 1631 | if (host->bus_ops && !host->bus_dead) { | 1631 | if (host->bus_ops && !host->bus_dead) { |
| 1632 | if (host->bus_ops->suspend) | 1632 | if (host->bus_ops->suspend) |
| 1633 | err = host->bus_ops->suspend(host); | 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 | mmc_bus_put(host); | 1648 | mmc_bus_put(host); |
| 1636 | 1649 | ||