Fix ACPI suspend / device suspend ordering problem
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 16 May 2007 22:28:14 +0000 (15:28 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 16 May 2007 22:33:19 +0000 (15:33 -0700)
commit52ade9b3b97fd3bea42842a056fe0786c28d0555
tree70ae152f573b5d0f5078e2506830c3b804ab6816
parent7b104bcb8e460e45a1aebe3da9b86aacdb4cab12
Fix ACPI suspend / device suspend ordering problem

In commit e3c7db621bed4afb8e231cb005057f2feb5db557 we fixed the resume
ordering, so that the ACPI low-level resume code was called before the
actual driver resume was called. However, that broke the nesting logic
of suspend and resume, and we continued to suspend the devices _after_
we the ACPI device suspend code was called.

That resulted in us saving PCI state for devices that had already been
changed by ACPI, and in some cases disabled entirely (causing the PCI
save_state to be all-ones).  Which in turn caused the wrong state to be
written back on resume.

This moves the ACPI device suspend to after the device model per-device
suspend() calls. This fixes the bogus state save.

Thanks to Lukáš Hejtmánek for testing.

Acked-by: Lukas Hejtmanek <xhejtman@ics.muni.cz>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Len Brown <len.brown@intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
kernel/power/main.c