summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorPunit Agrawal <punit.agrawal@arm.com>2016-10-18 19:07:19 +0300
committerBen Hutchings <ben@decadent.org.uk>2017-02-23 06:54:20 +0300
commit0472b28bcde40b44cb802c02a1a8aa5996927d05 (patch)
tree02dd7720c6c03e8c9e55724cbbb01b9eea31ed0f /drivers/acpi
parent95e6876830ab18697bb4d59f2dbf5274490d4201 (diff)
downloadlinux-0472b28bcde40b44cb802c02a1a8aa5996927d05.tar.xz
ACPI / APEI: Fix incorrect return value of ghes_proc()
commit 806487a8fc8f385af75ed261e9ab658fc845e633 upstream. Although ghes_proc() tests for errors while reading the error status, it always return success (0). Fix this by propagating the return value. Fixes: d334a49113a4a33 (ACPI, APEI, Generic Hardware Error Source memory error support) Signed-of-by: Punit Agrawal <punit.agrawa.@arm.com> Tested-by: Tyler Baicar <tbaicar@codeaurora.org> Reviewed-by: Borislav Petkov <bp@suse.de> [ rjw: Subject ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/apei/ghes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index dab7cb7349df..282c21c37fc4 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -679,7 +679,7 @@ static int ghes_proc(struct ghes *ghes)
ghes_do_proc(ghes, ghes->estatus);
out:
ghes_clear_estatus(ghes);
- return 0;
+ return rc;
}
static void ghes_add_timer(struct ghes *ghes)