summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-10-15 00:45:37 -0400
committerLen Brown <len.brown@intel.com>2009-10-15 00:45:37 -0400
commitf63a904891de9da7828b3eb6c99c45a26ec5b475 (patch)
treeca48570d54eb2038140e9540099e09293bbb7b1a
parenta3ccf63ee643ef243cbf8918da8b3f9238f10029 (diff)
parent497fb54f578efd2b479727bc88d5ef942c0a1e2d (diff)
downloadlinux-sh-f63a904891de9da7828b3eb6c99c45a26ec5b475.tar.gz
Merge branch 'bugzilla-14129' into release
-rw-r--r--drivers/acpi/pci_root.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 31122214e0ec..1af808171d46 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -389,6 +389,17 @@ struct pci_dev *acpi_get_pci_dev(acpi_handle handle)
pbus = pdev->subordinate;
pci_dev_put(pdev);
+
+ /*
+ * This function may be called for a non-PCI device that has a
+ * PCI parent (eg. a disk under a PCI SATA controller). In that
+ * case pdev->subordinate will be NULL for the parent.
+ */
+ if (!pbus) {
+ dev_dbg(&pdev->dev, "Not a PCI-to-PCI bridge\n");
+ pdev = NULL;
+ break;
+ }
}
out:
list_for_each_entry_safe(node, tmp, &device_list, node)