From 75c91f8c6cd727e4ce46f5832123f2b57e78ea71 Mon Sep 17 00:00:00 2001 From: Kenji Kaneshige Date: Tue, 17 Feb 2009 14:11:56 +0900 Subject: [PATCH] --- yaml --- r: 139340 b: refs/heads/master c: 0747aaf42d78d26684c6f6b34a4103ff81f571f8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/pci-acpi.h | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f1ffc6ec30eb..f6da70a21dff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a3c244c9a355105bc193fde873c73727bf87192 +refs/heads/master: 0747aaf42d78d26684c6f6b34a4103ff81f571f8 diff --git a/trunk/include/linux/pci-acpi.h b/trunk/include/linux/pci-acpi.h index 20480b9f10c8..3cee2367459f 100644 --- a/trunk/include/linux/pci-acpi.h +++ b/trunk/include/linux/pci-acpi.h @@ -23,11 +23,10 @@ static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev) static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus) { - int seg = pci_domain_nr(pbus), busnr = pbus->number; - struct pci_dev *bridge = pbus->self; - if (bridge) - return DEVICE_ACPI_HANDLE(&(bridge->dev)); - return acpi_get_pci_rootbridge_handle(seg, busnr); + if (pbus->parent) + return DEVICE_ACPI_HANDLE(&(pbus->self->dev)); + return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus), + pbus->number); } #else static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)