Merge branch 'sh/stable-updates'

Conflicts:
	arch/sh/kernel/dwarf.c
	drivers/dma/shdma.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 83f0affadcae..e9caf694c59e 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1179,15 +1179,10 @@ static void omap_hsmmc_detect(struct work_struct *work)
                 carddetect = -ENOSYS;
         }
 
-        if (carddetect) {
+        if (carddetect)
                 mmc_detect_change(host->mmc, (HZ * 200) / 1000);
-        } else {
-                mmc_host_enable(host->mmc);
-                omap_hsmmc_reset_controller_fsm(host, SRD);
-                mmc_host_lazy_disable(host->mmc);
-
+        else
                 mmc_detect_change(host->mmc, (HZ * 50) / 1000);
-        }
 }
 
 /*