ACPICA: Fix incorrect handling of PCI Express Root Bridge _HID

I could not get correct PCI Express bus number from the structure of
acpi_object_extra. I always get zero as bus number regardless of bus
location. I found that there is incorrect comparison with _HID (PNP0A08) in
acpi/events/evrgnini.c and PCI Express _BBN method always fail.
Therefore, we always get zero as PCI Express bus number.
http://bugzilla.kernel.org/show_bug.cgi?id=7145

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c
index 5b3c7a85eb9a..203d1359190a 100644
--- a/drivers/acpi/events/evrgnini.c
+++ b/drivers/acpi/events/evrgnini.c
@@ -225,13 +225,12 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
                                 if (!
                                     (ACPI_STRNCMP
                                      (object_hID.value, PCI_ROOT_HID_STRING,
-                                      sizeof(PCI_ROOT_HID_STRING))
-                                     ||
-                                     !(ACPI_STRNCMP
-                                       (object_hID.value,
-                                        PCI_EXPRESS_ROOT_HID_STRING,
-                                        sizeof(PCI_EXPRESS_ROOT_HID_STRING)))))
-                                {
+                                      sizeof(PCI_ROOT_HID_STRING)))
+                                    ||
+                                    !(ACPI_STRNCMP
+                                      (object_hID.value,
+                                       PCI_EXPRESS_ROOT_HID_STRING,
+                                       sizeof(PCI_EXPRESS_ROOT_HID_STRING)))) {
 
                                         /* Install a handler for this PCI root bridge */