diff options
| author | Yu Zhao <yu.zhao@intel.com> | 2009-06-26 14:04:46 +0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-06-29 12:13:13 -0700 |
| commit | 654b75e044119bf8e7d773bce41ea039281bbfbe (patch) | |
| tree | 5c749390a41cbbd59617d5dd1cee5160392b5feb /drivers | |
| parent | 977badb2f385db14d8ba3fcf02fbd7ead8e63d0f (diff) | |
| download | op-kernel-dev-654b75e044119bf8e7d773bce41ea039281bbfbe.zip op-kernel-dev-654b75e044119bf8e7d773bce41ea039281bbfbe.tar.gz | |
PCI: check if bus has a proper bridge device before triggering SBR
For devices attached to the root bus, we can't trigger Secondary Bus
Reset because there is no bridge device associated with the bus. So
need to check bus->self again NULL first before using it.
Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Yu Zhao <yu.zhao@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 6c93af5..d5d6f56 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -2171,7 +2171,7 @@ static int pci_parent_bus_reset(struct pci_dev *dev, int probe) u16 ctrl; struct pci_dev *pdev; - if (dev->subordinate) + if (pci_is_root_bus(dev->bus) || dev->subordinate || !dev->bus->self) return -ENOTTY; list_for_each_entry(pdev, &dev->bus->devices, bus_list) |
