aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mmc/core/host.c')
-rw-r--r--drivers/mmc/core/host.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 96b2ca1f1b06..3e11217857bc 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -493,7 +493,8 @@ int mmc_add_host(struct mmc_host *host)
493#endif 493#endif
494 494
495 mmc_start_host(host); 495 mmc_start_host(host);
496 mmc_register_pm_notifier(host); 496 if (!(host->pm_flags & MMC_PM_IGNORE_PM_NOTIFY))
497 mmc_register_pm_notifier(host);
497 498
498 return 0; 499 return 0;
499} 500}
@@ -510,7 +511,8 @@ EXPORT_SYMBOL(mmc_add_host);
510 */ 511 */
511void mmc_remove_host(struct mmc_host *host) 512void mmc_remove_host(struct mmc_host *host)
512{ 513{
513 mmc_unregister_pm_notifier(host); 514 if (!(host->pm_flags & MMC_PM_IGNORE_PM_NOTIFY))
515 mmc_unregister_pm_notifier(host);
514 mmc_stop_host(host); 516 mmc_stop_host(host);
515 517
516#ifdef CONFIG_DEBUG_FS 518#ifdef CONFIG_DEBUG_FS