diff options
| author | Grygorii Strashko <Grygorii.Strashko@linaro.org> | 2015-04-23 13:43:43 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-05-20 15:26:15 +0300 |
| commit | 226b5b46116bd601e6822aa4283ba57954f1f3b2 (patch) | |
| tree | 720fd3e5b60e3875b883824aed8fa11b7b55645b /drivers/mmc/core | |
| parent | 8ce16f59d5cd4aa8f9a649eb9cc737e068714208 (diff) | |
| download | linux-226b5b46116bd601e6822aa4283ba57954f1f3b2.tar.xz | |
mmc: core: add missing pm event in mmc_pm_notify to fix hib restore
commit 184af16b09360d6273fd6160e6ff7f8e2482ef23 upstream.
The PM_RESTORE_PREPARE is not handled now in mmc_pm_notify(),
as result mmc_rescan() could be scheduled and executed at
late hibernation restore stages when MMC device is suspended
already - which, in turn, will lead to system crash on TI dra7-evm board:
WARNING: CPU: 0 PID: 3188 at drivers/bus/omap_l3_noc.c:148 l3_interrupt_handler+0x258/0x374()
44000000.ocp:L3 Custom Error: MASTER MPU TARGET L4_PER1_P3 (Idle): Data Access in User mode during Functional access
Hence, add missed PM_RESTORE_PREPARE PM event in mmc_pm_notify().
Fixes: 4c2ef25fe0b8 (mmc: fix all hangs related to mmc/sd card...)
Signed-off-by: Grygorii Strashko <Grygorii.Strashko@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/mmc/core')
| -rw-r--r-- | drivers/mmc/core/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 7dc0c85fdb60..767b47296e1b 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2620,6 +2620,7 @@ int mmc_pm_notify(struct notifier_block *notify_block, switch (mode) { case PM_HIBERNATION_PREPARE: case PM_SUSPEND_PREPARE: + case PM_RESTORE_PREPARE: spin_lock_irqsave(&host->lock, flags); host->rescan_disable = 1; spin_unlock_irqrestore(&host->lock, flags); |