From 301dd41fcc8d856d96e4c6e2f6cab7e5def71c0c Mon Sep 17 00:00:00 2001
From: Shaohua Li <shaohua.li@intel.com>
Date: Thu, 8 Apr 2010 11:16:15 +0800
Subject: [PATCH] --- yaml --- r: 190711 b: refs/heads/master c:
 4bdae98f1a456ea1fea5ea02f9249d23bceab75b h: refs/heads/master i:   190709:
 9ebfb1fedeb0fa1e8b626e2a86d239d635c35cd5   190707:
 f6ac02372e3c796e67dbca78fb100cee6ec5fe14   190703:
 c95fa66f2d6aac21add6dea7dbba943694c425cf v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/acpi/hest.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 75826ec1bd4a..acca99384bfb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97c227cb51ddcf52c66f7a7fba69237026418b56
+refs/heads/master: 4bdae98f1a456ea1fea5ea02f9249d23bceab75b
diff --git a/trunk/drivers/acpi/hest.c b/trunk/drivers/acpi/hest.c
index 4bb18c980ac6..1c527a192872 100644
--- a/trunk/drivers/acpi/hest.c
+++ b/trunk/drivers/acpi/hest.c
@@ -123,6 +123,10 @@ int acpi_hest_firmware_first_pci(struct pci_dev *pci)
 {
 	acpi_status status = AE_NOT_FOUND;
 	struct acpi_table_header *hest = NULL;
+
+	if (acpi_disabled)
+		return 0;
+
 	status = acpi_get_table(ACPI_SIG_HEST, 1, &hest);
 
 	if (ACPI_SUCCESS(status)) {