PCI: Ensure we re-enable devices on resume
authorMatthew Garrett <mjg@redhat.com>
Thu, 22 Apr 2010 13:30:51 +0000 (09:30 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 12 May 2010 21:57:12 +0000 (14:57 -0700)
commit523273f08eb995890ab4c3012cb95fd07686de1c
treeb2410eec38ba84c854c3c2cc3a966369547286c3
parent5d5749c86711c91499820043202db1f534d0aeec
PCI: Ensure we re-enable devices on resume

commit cc2893b6af5265baa1d68b17b136cffca9e40cfa upstream.

If the firmware puts a device back into D0 state at resume time, we'll
update its state in resume_noirq and thus skip the platform resume code.
Calling that code twice should be safe and we ought to avoid getting to
that point anyway, so remove the check and also allow the platform pci
code to be called for D0.

Fixes USB not being powered after resume on recent Lenovo machines.

Acked-by: Alex Chiang <achiang@canonical.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/pci/pci.c