| Message ID | 20240522213649.2860-2-W_Armin@gmx.de (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | [1/2] ACPI: EC: Abort address space access upon error | expand |
On Wed, May 22, 2024 at 11:37 PM Armin Wolf <W_Armin@gmx.de> wrote: > > If an error code other than EINVAL, ENODEV or ETIME is returned > by acpi_ec_read()/acpi_ec_write(), then AE_OK is wrongly returned. > > Fix this by only returning AE_OK if the return code is 0, and > return AE_ERROR otherwise. > > Signed-off-by: Armin Wolf <W_Armin@gmx.de> > --- > drivers/acpi/ec.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c > index a68dce2147a4..68dd17f96f63 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; > } > } > > -- Applied (with some edits in the subject and changelog) along with the [1/2] as 6.10-rc material, thanks!
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index a68dce2147a4..68dd17f96f63 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; } }
If an error code other than EINVAL, ENODEV or ETIME is returned by acpi_ec_read()/acpi_ec_write(), then AE_OK is wrongly returned. Fix this by only returning AE_OK if the return code is 0, and return AE_ERROR otherwise. Signed-off-by: Armin Wolf <W_Armin@gmx.de> --- drivers/acpi/ec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.39.2