diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2010-04-08 05:16:15 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-05-06 08:39:06 +0200 |
| commit | 4bdae98f1a456ea1fea5ea02f9249d23bceab75b (patch) | |
| tree | b6c836b987f10f415fede5f0aa5defbe59d082fb /drivers/acpi | |
| parent | sbshc: acpi_device_class "smbus_host_controller" too long (diff) | |
| download | linux-4bdae98f1a456ea1fea5ea02f9249d23bceab75b.tar.xz linux-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>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/hest.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/hest.c b/drivers/acpi/hest.c index 4bb18c980ac6..1c527a192872 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)) { |