diff --git a/[refs] b/[refs] index 35309aff5e37..0c38fdc78b2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95a629657dbe28e44a312c47815b3dc3f1ce0970 +refs/heads/master: 11f3859b1e85dd408756c72e228cfb5aa7230c87 diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c index afee2de3f323..3dcb83d7eb25 100644 --- a/trunk/drivers/pci/pci.c +++ b/trunk/drivers/pci/pci.c @@ -445,7 +445,7 @@ pci_enable_device_bars(struct pci_dev *dev, int bars) int err; err = pci_set_power_state(dev, PCI_D0); - if (err) + if (err < 0 && err != -EIO) return err; err = pcibios_enable_device(dev, bars); if (err < 0)