From 28544c27b2a2a0638c6ae18385518c037682d1ff Mon Sep 17 00:00:00 2001 From: Yu Zhao Date: Fri, 26 Jun 2009 14:04:46 +0800 Subject: [PATCH] --- yaml --- r: 154970 b: refs/heads/master c: 654b75e044119bf8e7d773bce41ea039281bbfbe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4ce4904c1e77..59f1dc3582e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 977badb2f385db14d8ba3fcf02fbd7ead8e63d0f +refs/heads/master: 654b75e044119bf8e7d773bce41ea039281bbfbe diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c index 6c93af5ced18..d5d6f5667d83 100644 --- a/trunk/drivers/pci/pci.c +++ b/trunk/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)