Commit 382e1596 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-sleep' 

* pm-sleep:
  PM / Sleep: call early resume handlers when suspend_noirq fails
parents bd798b7a 064b021f

drivers/base/power/main.c

+9 −1
Original line number Diff line number Diff line
@@ -991,8 +991,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;



	error = dpm_suspend_noirq(state);

	if (error) {

		dpm_resume_early(state);

		return error;

	}



	return error ? : dpm_suspend_noirq(state);

	return 0;

}

EXPORT_SYMBOL_GPL(dpm_suspend_end);