From: Armin Wolf <W_Armin@gmx.de>
Date: Wed, 22 May 2024 21:36:49 +0000 (+0200)
Subject: ACPI: EC: Avoid returning AE_OK on errors in address space handler
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c4bd7f1d78340e63de4d073fd3dbe5391e2996e5;p=linux.git

ACPI: EC: Avoid returning AE_OK on errors in address space handler

If an error code other than EINVAL, ENODEV or ETIME is returned
by acpi_ec_read() / acpi_ec_write(), then AE_OK is incorrectly
returned by acpi_ec_space_handler().

Fix this by only returning AE_OK on success, and return AE_ERROR
otherwise.

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
[ rjw: Subject and changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index a68dce2147a4d..68dd17f96f636 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1351,8 +1351,10 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
 		return AE_NOT_FOUND;
 	case -ETIME:
 		return AE_TIME;
-	default:
+	case 0:
 		return AE_OK;
+	default:
+		return AE_ERROR;
 	}
 }