| From ebe7dd45cf49e3b49cacbaace17f9f878f21fbea Mon Sep 17 00:00:00 2001 |
| From: Adrian Hunter <adrian.hunter@intel.com> |
| Date: Tue, 21 Nov 2017 15:42:29 +0200 |
| Subject: mmc: core: Do not leave the block driver in a suspended state |
| |
| From: Adrian Hunter <adrian.hunter@intel.com> |
| |
| commit ebe7dd45cf49e3b49cacbaace17f9f878f21fbea upstream. |
| |
| The block driver must be resumed if the mmc bus fails to suspend the card. |
| |
| Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> |
| Reviewed-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/mmc/core/bus.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/drivers/mmc/core/bus.c |
| +++ b/drivers/mmc/core/bus.c |
| @@ -155,6 +155,9 @@ static int mmc_bus_suspend(struct device |
| return ret; |
| |
| ret = host->bus_ops->suspend(host); |
| + if (ret) |
| + pm_generic_resume(dev); |
| + |
| return ret; |
| } |
| |