diff options
author | Junchang Wang <junchangwang@gmail.com> | 2010-06-17 22:02:33 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-07-30 12:29:14 -0400 |
commit | 2eb5ebd3665a38a4526b45cb3a31a132b2aa9927 (patch) | |
tree | 1243c320e14eaf58a1208ccb021b8e70891d85ca /drivers/pci/bus.c | |
parent | 7736a05a320712c0a9b8f9e1cd0688b2c0848009 (diff) |
PCI: check return value of pci_enable_device() when enabling bridges
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>
Diffstat (limited to 'drivers/pci/bus.c')
-rw-r--r-- | drivers/pci/bus.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 42eea5fbc13b..7f0af0e9b826 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c | |||
@@ -240,6 +240,8 @@ void pci_enable_bridges(struct pci_bus *bus) | |||
240 | if (dev->subordinate) { | 240 | if (dev->subordinate) { |
241 | if (!pci_is_enabled(dev)) { | 241 | if (!pci_is_enabled(dev)) { |
242 | retval = pci_enable_device(dev); | 242 | retval = pci_enable_device(dev); |
243 | if (retval) | ||
244 | dev_err(&dev->dev, "Error enabling bridge (%d), continuing\n", retval); | ||
243 | pci_set_master(dev); | 245 | pci_set_master(dev); |
244 | } | 246 | } |
245 | pci_enable_bridges(dev->subordinate); | 247 | pci_enable_bridges(dev->subordinate); |