From 454cd236db73c4e82e3889c6e43298c7e7110764 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Sun, 16 Jan 2011 20:44:22 +0100
Subject: [PATCH] --- yaml --- r: 231531 b: refs/heads/master c:
 d3072e6a7e9bf7aca200370317f8e297be360b17 h: refs/heads/master i:   231529:
 af733ce4c210906be66cdb03ee2faf3f9e628e20   231527:
 02580d16c8ac0a2471213cacd5c6aeae0ea2908f v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/acpi/apei/hest.c | 6 +++---
 trunk/drivers/acpi/pci_root.c  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index bc837595eb4a..1a190af4de55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc8fe1e992ae0326a88edbe4d6793e840bbdd4ff
+refs/heads/master: d3072e6a7e9bf7aca200370317f8e297be360b17
diff --git a/trunk/drivers/acpi/apei/hest.c b/trunk/drivers/acpi/apei/hest.c
index 4ee58e72b730..abda3786a5d7 100644
--- a/trunk/drivers/acpi/apei/hest.c
+++ b/trunk/drivers/acpi/apei/hest.c
@@ -201,14 +201,14 @@ void __init acpi_hest_init(void)
 	int rc = -ENODEV;
 	unsigned int ghes_count = 0;
 
-	if (acpi_disabled)
-		return;
-
 	if (hest_disable) {
 		pr_info(HEST_PFX "Table parsing disabled.\n");
 		return;
 	}
 
+	if (acpi_disabled)
+		goto err;
+
 	status = acpi_get_table(ACPI_SIG_HEST, 0,
 				(struct acpi_table_header **)&hest_tab);
 	if (status == AE_NOT_FOUND) {
diff --git a/trunk/drivers/acpi/pci_root.c b/trunk/drivers/acpi/pci_root.c
index d9766797cd98..85249395623b 100644
--- a/trunk/drivers/acpi/pci_root.c
+++ b/trunk/drivers/acpi/pci_root.c
@@ -633,11 +633,11 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type)
 
 static int __init acpi_pci_root_init(void)
 {
+	acpi_hest_init();
+
 	if (acpi_pci_disabled)
 		return 0;
 
-	acpi_hest_init();
-
 	pci_acpi_crs_quirks();
 	if (acpi_bus_register_driver(&acpi_pci_root_driver) < 0)
 		return -ENODEV;