diff options
| author | Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 2006-12-18 02:27:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-08 00:50:03 +0100 |
| commit | 924b08f3ff12eb0e8ecd9e9a9b6a5b884a495c23 (patch) | |
| tree | a5088c74cafed4f7c3b2bff32c4912129ae5abd3 /drivers/pci/pci-driver.c | |
| parent | PCI: check szhi when sz is 0 when 64 bit iomem bigger than 4G (diff) | |
| download | linux-924b08f3ff12eb0e8ecd9e9a9b6a5b884a495c23.tar.xz linux-924b08f3ff12eb0e8ecd9e9a9b6a5b884a495c23.zip | |
PCI : remove too specialized __pci_enable_device for default resume
Original patch was posted as "PCI : Move pci_fixup_device and is_enabled".
This 1 of 3 patches does:
- reverts small part of Inaky's patch
(remove __pci_enable_device)
This change will be recovered by 3rd patch.
- temporarily remove pci_fixup_device.
This change will be recovered by 2nd 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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 92d5e8db0de7..1ec546d3d53c 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -325,7 +325,7 @@ static int pci_default_resume(struct pci_dev *pci_dev) 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_enable_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); |