diff options
| author | Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 2006-12-18 10:30:00 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 15:50:03 -0800 |
| commit | 38cc13022ed3cea949722d5a6f49025da82c9fd0 (patch) | |
| tree | 5d6051a294f70dca2fdb86b1966cb3a5945fdfb8 /drivers/pci/pci-driver.c | |
| parent | 9fb625c3cc3731097a142ecae79a0369fb854c2d (diff) | |
| download | kernel-crypto-38cc13022ed3cea949722d5a6f49025da82c9fd0.tar.gz kernel-crypto-38cc13022ed3cea949722d5a6f49025da82c9fd0.tar.xz kernel-crypto-38cc13022ed3cea949722d5a6f49025da82c9fd0.zip | |
PCI : add extremely specialized __pci_reenable_device for default resume
Original patch was posted as "PCI : Move pci_fixup_device and is_enabled".
This 3 of 3 patches does:
- add __pci_reenable_device
(recover former change of 1st patch)
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/pci-driver.c')
| -rw-r--r-- | drivers/pci/pci-driver.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 1ec546d3d53..dd2da9b6b11 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -324,8 +324,7 @@ static int pci_default_resume(struct pci_dev *pci_dev) /* restore the PCI config space */ pci_restore_state(pci_dev); /* if the device was enabled before suspend, reenable */ - if (atomic_read(&pci_dev->enable_cnt)) - retval = pci_enable_device(pci_dev); + retval = __pci_reenable_device(pci_dev); /* if the device was busmaster before the suspend, make it busmaster again */ if (pci_dev->is_busmaster) pci_set_master(pci_dev); |