[PATCH] ACPI: SBS: Fix present test in acpi_battery_read()

Dan Carpenter posted 1 patch 3 months, 1 week ago
drivers/acpi/sbs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] ACPI: SBS: Fix present test in acpi_battery_read()
Posted by Dan Carpenter 3 months, 1 week ago
The battery->present variable is a 1 bit bitfield in a u8.  This means
that the "state & (1 << battery->id)" test will only work when
"battery->id" is zero, otherwise ->present is zero.  Fix this by adding
a !!.

Fixes: db1c291af7ad ("ACPI: SBS: Make SBS reads table-driven.")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
This is a new static checker warning that Harshit and I wrote.  It's
untested.

 drivers/acpi/sbs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index a3f95a3fffde..d3edc3bcbf01 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -487,7 +487,7 @@ static int acpi_battery_read(struct acpi_battery *battery)
 		if (result)
 			return result;
 
-		battery->present = state & (1 << battery->id);
+		battery->present = !!(state & (1 << battery->id));
 		if (!battery->present)
 			return 0;
 
-- 
2.51.0
Re: [PATCH] ACPI: SBS: Fix present test in acpi_battery_read()
Posted by Rafael J. Wysocki 3 months ago
On Fri, Oct 31, 2025 at 2:03 PM Dan Carpenter <dan.carpenter@linaro.org> wrote:
>
> The battery->present variable is a 1 bit bitfield in a u8.  This means
> that the "state & (1 << battery->id)" test will only work when
> "battery->id" is zero, otherwise ->present is zero.  Fix this by adding
> a !!.
>
> Fixes: db1c291af7ad ("ACPI: SBS: Make SBS reads table-driven.")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
> This is a new static checker warning that Harshit and I wrote.  It's
> untested.
>
>  drivers/acpi/sbs.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
> index a3f95a3fffde..d3edc3bcbf01 100644
> --- a/drivers/acpi/sbs.c
> +++ b/drivers/acpi/sbs.c
> @@ -487,7 +487,7 @@ static int acpi_battery_read(struct acpi_battery *battery)
>                 if (result)
>                         return result;
>
> -               battery->present = state & (1 << battery->id);
> +               battery->present = !!(state & (1 << battery->id));
>                 if (!battery->present)
>                         return 0;
>
> --

Applied as 6.18-rc material, thanks!