diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-03-05 12:46:53 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-03-05 12:46:53 -0800 |
| commit | a182a74e0ad6bd978d4fe8f95be8501e74c03883 (patch) | |
| tree | acd918f2e5d3260fe1f120f63c15c6db1f7ab0b6 /drivers/mmc | |
| parent | 4dbcf834ffddf069c5a40418252211c9cc819f2e (diff) | |
| download | kernel_samsung_aries-a182a74e0ad6bd978d4fe8f95be8501e74c03883.zip kernel_samsung_aries-a182a74e0ad6bd978d4fe8f95be8501e74c03883.tar.gz kernel_samsung_aries-a182a74e0ad6bd978d4fe8f95be8501e74c03883.tar.bz2 | |
mmc: sdhci: Skip rest of suspend if mmc_suspend_host() fails
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r--[-rwxr-xr-x] | drivers/mmc/host/sdhci.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 46042f7..1536485 100755..100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2329,6 +2329,10 @@ int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state) } ret = mmc_suspend_host(host->mmc); + if (ret) { + sdhci_enable_card_detection(host); + return ret; + } sdhci_mask_irqs(host, SDHCI_INT_ALL_MASK); |