aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2005-08-10 15:18:44 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-08 17:57:25 -0400
commit11f3859b1e85dd408756c72e228cfb5aa7230c87 (patch)
treec3bbf898ee5c45299dd111853c9756a594fa6ecf /drivers/pci/pci.c
parent95a629657dbe28e44a312c47815b3dc3f1ce0970 (diff)
[PATCH] PCI: Fix regression in pci_enable_device_bars
This patch (as552) fixes yet another small problem recently added. If an attempt to put a PCI device back into D0 fails because the device doesn't support PCI PM, it shouldn't count as error. Without this patch the UHCI controllers on my Intel motherboard don't work. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r--drivers/pci/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index afee2de3f323..3dcb83d7eb25 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -445,7 +445,7 @@ pci_enable_device_bars(struct pci_dev *dev, int bars)
445 int err; 445 int err;
446 446
447 err = pci_set_power_state(dev, PCI_D0); 447 err = pci_set_power_state(dev, PCI_D0);
448 if (err) 448 if (err < 0 && err != -EIO)
449 return err; 449 return err;
450 err = pcibios_enable_device(dev, bars); 450 err = pcibios_enable_device(dev, bars);
451 if (err < 0) 451 if (err < 0)