On Thursday, July 19, 2012, Colin Cross wrote:
> Commit cf579dfb82550e34de7ccf3ef090d8b834ccd3a9 (PM / Sleep: Introduce
> "late suspend" and "early resume" of devices) introduced a bug where
> suspend_late handlers would be called, but if dpm_suspend_noirq returned
> an error the early_resume handlers would never be called. All devices
> would end up on the dpm_late_early_list, and would never be resumed
> again.
>
> Fix it by calling dpm_resume_early when dpm_suspend_noirq returns
> an error.
>
> Signed-off-by: Colin Cross <[email protected]>
Nice catch, thanks!
Applied, with a CC to -stable.
Thanks,
Rafael
> ---
> drivers/base/power/main.c | 10 +++++++++-
> 1 files changed, 9 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
> index 9cb845e..742fcbe 100644
> --- a/drivers/base/power/main.c
> +++ b/drivers/base/power/main.c
> @@ -989,8 +989,16 @@ static int dpm_suspend_late(pm_message_t state)
> int dpm_suspend_end(pm_message_t state)
> {
> int error = dpm_suspend_late(state);
> + if (error)
> + return error;
>
> - return error ? : dpm_suspend_noirq(state);
> + error = dpm_suspend_noirq(state);
> + if (error) {
> + dpm_resume_early(state);
> + return error;
> + }
> +
> + return 0;
> }
> EXPORT_SYMBOL_GPL(dpm_suspend_end);
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
