diff options
| author | Colin Cross <ccross@android.com> | 2010-10-07 17:35:27 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-10-07 17:35:27 -0700 |
| commit | ecf1cce25ccc5bf6326ae00cf0675a4ff9a9ff2d (patch) | |
| tree | 3c14e10326759a8521e6b33a090ecafb0812e4ec /drivers/mmc | |
| parent | bb3212324ff996f4cd5e854d4bbd63858badc1df (diff) | |
| parent | 6098ced7ab5faec700ebc8ecec81bdd624969a66 (diff) | |
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/host.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index d80cfdc8edd2..ba684e6d2b6b 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -137,7 +137,8 @@ int mmc_add_host(struct mmc_host *host) #endif mmc_start_host(host); - register_pm_notifier(&host->pm_notify); + if (!(host->pm_flags & MMC_PM_IGNORE_PM_NOTIFY)) + register_pm_notifier(&host->pm_notify); return 0; } @@ -154,7 +155,9 @@ EXPORT_SYMBOL(mmc_add_host); */ void mmc_remove_host(struct mmc_host *host) { - unregister_pm_notifier(&host->pm_notify); + if (!(host->pm_flags & MMC_PM_IGNORE_PM_NOTIFY)) + unregister_pm_notifier(&host->pm_notify); + mmc_stop_host(host); #ifdef CONFIG_DEBUG_FS |