aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mmc/core/core.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index e9a104b9e4d3..d2ee2829b313 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2483,9 +2483,7 @@ void mmc_stop_host(struct mmc_host *host)
2483 mmc_bus_get(host); 2483 mmc_bus_get(host);
2484 if (host->bus_ops && !host->bus_dead) { 2484 if (host->bus_ops && !host->bus_dead) {
2485 /* Calling bus_ops->remove() with a claimed host can deadlock */ 2485 /* Calling bus_ops->remove() with a claimed host can deadlock */
2486 if (host->bus_ops->remove) 2486 host->bus_ops->remove(host);
2487 host->bus_ops->remove(host);
2488
2489 mmc_claim_host(host); 2487 mmc_claim_host(host);
2490 mmc_detach_bus(host); 2488 mmc_detach_bus(host);
2491 mmc_power_off(host); 2489 mmc_power_off(host);
@@ -2638,8 +2636,7 @@ int mmc_suspend_host(struct mmc_host *host)
2638 * bus_ops->remove() with a claimed host can 2636 * bus_ops->remove() with a claimed host can
2639 * deadlock.) 2637 * deadlock.)
2640 */ 2638 */
2641 if (host->bus_ops->remove) 2639 host->bus_ops->remove(host);
2642 host->bus_ops->remove(host);
2643 mmc_claim_host(host); 2640 mmc_claim_host(host);
2644 mmc_detach_bus(host); 2641 mmc_detach_bus(host);
2645 mmc_power_off(host); 2642 mmc_power_off(host);
@@ -2722,9 +2719,7 @@ int mmc_pm_notify(struct notifier_block *notify_block,
2722 break; 2719 break;
2723 2720
2724 /* Calling bus_ops->remove() with a claimed host can deadlock */ 2721 /* Calling bus_ops->remove() with a claimed host can deadlock */
2725 if (host->bus_ops->remove) 2722 host->bus_ops->remove(host);
2726 host->bus_ops->remove(host);
2727
2728 mmc_claim_host(host); 2723 mmc_claim_host(host);
2729 mmc_detach_bus(host); 2724 mmc_detach_bus(host);
2730 mmc_power_off(host); 2725 mmc_power_off(host);