diff options
| author | Len Brown <len.brown@intel.com> | 2012-01-18 00:18:10 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-01-18 00:18:10 -0500 |
| commit | 037d76f40430ba1269dc7d1fee22382cd9672997 (patch) | |
| tree | 0a378e88951655aa0042645fbd12b7058be95c3e /drivers/acpi/apei/erst.c | |
| parent | 5d1f86572685d577b76142b7c61453000e1a5e26 (diff) | |
| parent | 4134b8c8811f23aa8a281db50dcee64dda414736 (diff) | |
| download | talos-obmc-linux-037d76f40430ba1269dc7d1fee22382cd9672997.tar.gz talos-obmc-linux-037d76f40430ba1269dc7d1fee22382cd9672997.zip | |
Merge branch 'apei' into release
Diffstat (limited to 'drivers/acpi/apei/erst.c')
| -rw-r--r-- | drivers/acpi/apei/erst.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c index 631b9477b99c..8e8d786c5d23 100644 --- a/drivers/acpi/apei/erst.c +++ b/drivers/acpi/apei/erst.c @@ -1125,10 +1125,9 @@ static int __init erst_init(void) status = acpi_get_table(ACPI_SIG_ERST, 0, (struct acpi_table_header **)&erst_tab); - if (status == AE_NOT_FOUND) { - pr_info(ERST_PFX "Table is 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(ERST_PFX "Failed to get table, %s\n", msg); rc = -EINVAL; |
