diff options
| author | Len Brown <len.brown@intel.com> | 2009-10-15 00:45:37 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-10-15 00:45:37 -0400 |
| commit | f63a904891de9da7828b3eb6c99c45a26ec5b475 (patch) | |
| tree | ca48570d54eb2038140e9540099e09293bbb7b1a /drivers | |
| parent | a3ccf63ee643ef243cbf8918da8b3f9238f10029 (diff) | |
| parent | 497fb54f578efd2b479727bc88d5ef942c0a1e2d (diff) | |
Merge branch 'bugzilla-14129' into release
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/pci_root.c | 11 |
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) | |||
| 389 | 389 | ||
| 390 | pbus = pdev->subordinate; | 390 | pbus = pdev->subordinate; |
| 391 | pci_dev_put(pdev); | 391 | pci_dev_put(pdev); |
| 392 | |||
| 393 | /* | ||
| 394 | * This function may be called for a non-PCI device that has a | ||
| 395 | * PCI parent (eg. a disk under a PCI SATA controller). In that | ||
| 396 | * case pdev->subordinate will be NULL for the parent. | ||
| 397 | */ | ||
| 398 | if (!pbus) { | ||
| 399 | dev_dbg(&pdev->dev, "Not a PCI-to-PCI bridge\n"); | ||
| 400 | pdev = NULL; | ||
| 401 | break; | ||
| 402 | } | ||
| 392 | } | 403 | } |
| 393 | out: | 404 | out: |
| 394 | list_for_each_entry_safe(node, tmp, &device_list, node) | 405 | list_for_each_entry_safe(node, tmp, &device_list, node) |