---

yaml --- r: 190711 b: refs/heads/master c: 4bdae98 h: refs/heads/master i: 190709: 9ebfb1f 190707: f6ac023 190703: c95fa66 v: v3
git-mirror · May 6, 2010 · 301dd41 · 301dd41
1 parent d8596d2
commit 301dd41
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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)) {