Commit 43e99076 authored by Adrian Hunter's avatar Adrian Hunter Committed by Kleber Sacilotto de Souza

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

BugLink: http://bugs.launchpad.net/bugs/1745043

commit ebe7dd45 upstream.

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>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent f5fddff0
...@@ -155,6 +155,9 @@ static int mmc_bus_suspend(struct device *dev) ...@@ -155,6 +155,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