diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-07-30 05:12:59 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-07-30 05:12:58 -0700 |
| commit | 1fe479555dbec29a50bd1377938746e1045237ef (patch) | |
| tree | 6db6173201900f8abdb822e7176e87c1c8d14c62 | |
| parent | 1deb9383f1a5c164dbc1dec03bbd48d6101f5d3c (diff) | |
| parent | 08431ef0acd5b79259d626dc36bebef59b5a4439 (diff) | |
Merge "mmc: core: Use mmc_get_cd_gpio to get cd gpio status in resume path"
| -rw-r--r-- | drivers/mmc/core/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index e4e4e04e1d0c..76dbbbde884b 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -4572,8 +4572,8 @@ int mmc_pm_notify(struct notifier_block *notify_block, spin_lock_irqsave(&host->lock, flags); host->rescan_disable = 0; - if (host->ops->get_cd) - present = host->ops->get_cd(host); + if (mmc_card_is_removable(host)) + present = !!mmc_gpio_get_cd(host); if (mmc_bus_manual_resume(host) && !host->ignore_bus_resume_flags && |