commit 833c0d9a6e494dc29582efab53bc5a019400df8a
author Linux Build Service Account <lnxbuild@localhost> Tue Apr 01 14:12:55 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 01 14:12:54 2014 -0700
tree 7a91c9672e5b6f24c0d1f1d75d12068f5cad0cc2
parent 252481804608c66f4ff80ded630e009857ee6d6e
parent d526c63a62dc758fb2a324accdb36d491962caf1

Merge "mmc: core: enable async suspend"

drivers/mmc/core/bus.c

diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 667da01..a6fcec5 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -431,6 +431,7 @@
 	if (ret)
 		return ret;
 
+	device_enable_async_suspend(&card->dev);
 	if (mmc_use_core_runtime_pm(card->host) && !mmc_card_sdio(card)) {
 		card->rpm_attrib.show = show_rpm_delay;
 		card->rpm_attrib.store = store_rpm_delay;

drivers/mmc/core/host.c

diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index c082f77..c4b9724 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -722,6 +722,7 @@
 	if (err)
 		return err;
 
+	device_enable_async_suspend(&host->class_dev);
 	led_trigger_register_simple(dev_name(&host->class_dev), &host->led);
 
 #ifdef CONFIG_DEBUG_FS