| Message ID | 1511271770-3444-4-git-send-email-adrian.hunter@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Nov 21, 2017 at 2:42 PM, Adrian Hunter <adrian.hunter@intel.com> wrote: > 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> Also looks like a clear candidate for fixes. Yours, Linus Walleij
On 21 November 2017 at 14:42, Adrian Hunter <adrian.hunter@intel.com> wrote: > The block driver must be resumed if the mmc bus fails to suspend the card. > > Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Thanks, applied for fixes and added a stable tag (I think v3.19+ is the first one we can pick, else some other manual back porting is needed). Kind regards Uffe > --- > drivers/mmc/core/bus.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c > index a4b49e25fe96..7586ff2ad1f1 100644 > --- a/drivers/mmc/core/bus.c > +++ b/drivers/mmc/core/bus.c > @@ -157,6 +157,9 @@ static int mmc_bus_suspend(struct device *dev) > return ret; > > ret = host->bus_ops->suspend(host); > + if (ret) > + pm_generic_resume(dev); > + > return ret; > } > > -- > 1.9.1 >
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c index a4b49e25fe96..7586ff2ad1f1 100644 --- a/drivers/mmc/core/bus.c +++ b/drivers/mmc/core/bus.c @@ -157,6 +157,9 @@ static int mmc_bus_suspend(struct device *dev) return ret; ret = host->bus_ops->suspend(host); + if (ret) + pm_generic_resume(dev); + return ret; }
The block driver must be resumed if the mmc bus fails to suspend the card. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- drivers/mmc/core/bus.c | 3 +++ 1 file changed, 3 insertions(+)