diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-02-03 23:12:42 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-02-03 23:13:05 +0100 |
| commit | 972c5ae961d6e5103e2b33d935cfa4145fd47140 (patch) | |
| tree | 350b2a76b979ba8766c09838617df67ff330eca0 /drivers/acpi/apei/hest.c | |
| parent | 5196d20305d5e30d871111d3a876cf067dd94255 (diff) | |
| parent | 7c7ed8ec337bf5f62cc5287a6eb6b2f1b7504c2f (diff) | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply patch to a newer
code (namely drivers/gpu/drm/gma500/psb_intel_lvds.c)
Diffstat (limited to 'drivers/acpi/apei/hest.c')
| -rw-r--r-- | drivers/acpi/apei/hest.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c index 05fee06f4d6..7f00cf38098 100644 --- a/drivers/acpi/apei/hest.c +++ b/drivers/acpi/apei/hest.c @@ -41,7 +41,7 @@ #define HEST_PFX "HEST: " -int hest_disable; +bool hest_disable; EXPORT_SYMBOL_GPL(hest_disable); /* HEST table parsing */ @@ -221,10 +221,9 @@ void __init acpi_hest_init(void) status = acpi_get_table(ACPI_SIG_HEST, 0, (struct acpi_table_header **)&hest_tab); - if (status == AE_NOT_FOUND) { - pr_info(HEST_PFX "Table not found.\n"); + if (status == AE_NOT_FOUND) goto err; - } else if (ACPI_FAILURE(status)) { + else if (ACPI_FAILURE(status)) { const char *msg = acpi_format_exception(status); pr_err(HEST_PFX "Failed to get table, %s\n", msg); rc = -EINVAL; |