PCI: check return value of pci_enable_device() when enabling bridges
authorJunchang Wang <junchangwang@gmail.com>
Fri, 18 Jun 2010 02:02:33 +0000 (10:02 +0800)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Fri, 30 Jul 2010 16:29:14 +0000 (09:29 -0700)
pci_enable_device can fail. In that case, a printed warning would be
more appropriate.

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Junchang Wang <junchangwang@gmail.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
drivers/pci/bus.c

index 42eea5fbc13b92125e9e1386c1dba94a29c1f007..7f0af0e9b826dafa2e64d8302c130ea87e5af00b 100644 (file)
@@ -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);