diff --git a/[refs] b/[refs] index ab0cbf9e1771..0ba18e09031a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7736a05a320712c0a9b8f9e1cd0688b2c0848009 +refs/heads/master: 2eb5ebd3665a38a4526b45cb3a31a132b2aa9927 diff --git a/trunk/drivers/pci/bus.c b/trunk/drivers/pci/bus.c index 42eea5fbc13b..7f0af0e9b826 100644 --- a/trunk/drivers/pci/bus.c +++ b/trunk/drivers/pci/bus.c @@ -240,6 +240,8 @@ void pci_enable_bridges(struct pci_bus *bus) if (dev->subordinate) { if (!pci_is_enabled(dev)) { retval = pci_enable_device(dev); + if (retval) + dev_err(&dev->dev, "Error enabling bridge (%d), continuing\n", retval); pci_set_master(dev); } pci_enable_bridges(dev->subordinate);