Commit ebe7dd45 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson

mmc: core: Do not leave the block driver in a suspended state

The block driver must be resumed if the mmc bus fails to suspend the card.
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: stable@vger.kernel.org # v3.19+
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent fb8e456e
...@@ -157,6 +157,9 @@ static int mmc_bus_suspend(struct device *dev) ...@@ -157,6 +157,9 @@ static int mmc_bus_suspend(struct device *dev)
return ret; return ret;
ret = host->bus_ops->suspend(host); ret = host->bus_ops->suspend(host);
if (ret)
pm_generic_resume(dev);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment