aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShaohua Li <shaohua.li@intel.com>2010-04-08 11:16:15 +0800
committerLen Brown <len.brown@intel.com>2010-05-06 02:39:06 -0400
commit4bdae98f1a456ea1fea5ea02f9249d23bceab75b (patch)
treeb6c836b987f10f415fede5f0aa5defbe59d082fb
parent97c227cb51ddcf52c66f7a7fba69237026418b56 (diff)
downloadmrst-s0i3-test-4bdae98f1a456ea1fea5ea02f9249d23bceab75b.tar.gz
mrst-s0i3-test-4bdae98f1a456ea1fea5ea02f9249d23bceab75b.tar.xz
mrst-s0i3-test-4bdae98f1a456ea1fea5ea02f9249d23bceab75b.zip
ACPI: fix acpi_hest_firmware_first_pci() caused oops
acpi_hest_firmware_first_pci() could be called when acpi is disabled and cause system oops. Signed-off-by: Shaohua Li <shaohua.li@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/acpi/hest.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/hest.c b/drivers/acpi/hest.c
index 4bb18c980ac..1c527a19287 100644
--- a/drivers/acpi/hest.c
+++ b/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)) {