[v2] power: supply: sbs-battery: use correct flags field
diff mbox series

Message ID 20190816073742.26866-1-committed@heine.so
State Not Applicable, archived
Headers show
Series
  • [v2] power: supply: sbs-battery: use correct flags field
Related show

Commit Message

Michael Nosthoff Aug. 16, 2019, 7:37 a.m. UTC
the type flag is stored in the chip->flags field not in the
client->flags field. This currently leads to never using the ti
specific health function as client->flags doesn't use that bit.
So it's always falling back to the general one.

Fixes: 76b16f4cdfb8 ("power: supply: sbs-battery: don't assume
MANUFACTURER_DATA formats")

Signed-off-by: Michael Nosthoff <committed@heine.so>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Cc: <stable@vger.kernel.org>
---
Changes since v1:
* Changed comment according to Brian's suggestions
* Added Fixes tag
* Added reviewed and cc stable

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

Comments

Enric Balletbo Serra Aug. 27, 2019, 10:43 a.m. UTC | #1
Hi Michael,

I think that Sebastian is expected to be cc'ed, so adding him
(otherwise he can miss your patch)

Missatge de Michael Nosthoff <committed@heine.so> del dia dv., 16
d’ag. 2019 a les 9:38:
>
> the type flag is stored in the chip->flags field not in the
> client->flags field. This currently leads to never using the ti
> specific health function as client->flags doesn't use that bit.
> So it's always falling back to the general one.
>
> Fixes: 76b16f4cdfb8 ("power: supply: sbs-battery: don't assume
> MANUFACTURER_DATA formats")
>
> Signed-off-by: Michael Nosthoff <committed@heine.so>
> Reviewed-by: Brian Norris <briannorris@chromium.org>
> Cc: <stable@vger.kernel.org>

Found this patch while looking at another issue and LGTM, so in case
this helps the patch landing

Reviewed-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>

Thanks,
 Enric

> ---
> Changes since v1:
> * Changed comment according to Brian's suggestions
> * Added Fixes tag
> * Added reviewed and cc stable
>
>  drivers/power/supply/sbs-battery.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c
> index 048d205d7074..2e86cc1e0e35 100644
> --- a/drivers/power/supply/sbs-battery.c
> +++ b/drivers/power/supply/sbs-battery.c
> @@ -620,7 +620,7 @@ static int sbs_get_property(struct power_supply *psy,
>         switch (psp) {
>         case POWER_SUPPLY_PROP_PRESENT:
>         case POWER_SUPPLY_PROP_HEALTH:
> -               if (client->flags & SBS_FLAGS_TI_BQ20Z75)
> +               if (chip->flags & SBS_FLAGS_TI_BQ20Z75)
>                         ret = sbs_get_ti_battery_presence_and_health(client,
>                                                                      psp, val);
>                 else
> --
> 2.20.1
>
Sebastian Reichel Sept. 2, 2019, 7:59 a.m. UTC | #2
Hi,

On Fri, Aug 16, 2019 at 09:37:42AM +0200, Michael Nosthoff wrote:
> the type flag is stored in the chip->flags field not in the
> client->flags field. This currently leads to never using the ti
> specific health function as client->flags doesn't use that bit.
> So it's always falling back to the general one.
> 
> Fixes: 76b16f4cdfb8 ("power: supply: sbs-battery: don't assume
> MANUFACTURER_DATA formats")
> 
> Signed-off-by: Michael Nosthoff <committed@heine.so>
> Reviewed-by: Brian Norris <briannorris@chromium.org>
> Cc: <stable@vger.kernel.org>
> ---

Thanks, queued.

-- Sebastian

> Changes since v1:
> * Changed comment according to Brian's suggestions
> * Added Fixes tag
> * Added reviewed and cc stable
> 
>  drivers/power/supply/sbs-battery.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c
> index 048d205d7074..2e86cc1e0e35 100644
> --- a/drivers/power/supply/sbs-battery.c
> +++ b/drivers/power/supply/sbs-battery.c
> @@ -620,7 +620,7 @@ static int sbs_get_property(struct power_supply *psy,
>  	switch (psp) {
>  	case POWER_SUPPLY_PROP_PRESENT:
>  	case POWER_SUPPLY_PROP_HEALTH:
> -		if (client->flags & SBS_FLAGS_TI_BQ20Z75)
> +		if (chip->flags & SBS_FLAGS_TI_BQ20Z75)
>  			ret = sbs_get_ti_battery_presence_and_health(client,
>  								     psp, val);
>  		else
> -- 
> 2.20.1
>

Patch
diff mbox series

diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c
index 048d205d7074..2e86cc1e0e35 100644
--- a/drivers/power/supply/sbs-battery.c
+++ b/drivers/power/supply/sbs-battery.c
@@ -620,7 +620,7 @@  static int sbs_get_property(struct power_supply *psy,
 	switch (psp) {
 	case POWER_SUPPLY_PROP_PRESENT:
 	case POWER_SUPPLY_PROP_HEALTH:
-		if (client->flags & SBS_FLAGS_TI_BQ20Z75)
+		if (chip->flags & SBS_FLAGS_TI_BQ20Z75)
 			ret = sbs_get_ti_battery_presence_and_health(client,
 								     psp, val);
 		else