[PATCH] bq27x00_battery: fix flag register read

[PATCH] bq27x00_battery: fix flag register read

[Grazvydas Ignotas]

When reading flags, bq27x00_read() argument is inverted and causes
reads 2 of bytes for bq27200 and 1 byte for bq27500, while their register
sizes are 1 and 2 bytes respectively. This causes bq27500 upper flag
bits always to be returned as 0, causing full charge state to never be
reported correctly, so fix it.

Cc: Pali Rohár <pali.rohar@gmail.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
---
 drivers/power/bq27x00_battery.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 98bf567..86decb4 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -312,7 +312,7 @@ static void bq27x00_update(struct bq27x00_device_info *di)
 	struct bq27x00_reg_cache cache = {0, };
 	bool is_bq27500 = di->chip == BQ27500;
 
-	cache.flags = bq27x00_read(di, BQ27x00_REG_FLAGS, is_bq27500);
+	cache.flags = bq27x00_read(di, BQ27x00_REG_FLAGS, !is_bq27500);
 	if (cache.flags >= 0) {
 		if (!is_bq27500 && (cache.flags & BQ27000_FLAG_CI)) {
 			dev_info(di->dev, "battery is not calibrated! ignoring capacity values\n");
-- 
1.7.0.4

Re: [PATCH] bq27x00_battery: fix flag register read

[Pali Rohár]

[-- Attachment #1: Type: text/plain, Size: 1487 bytes --]

On Saturday 14 January 2012 22:50:49 Grazvydas Ignotas wrote:
> When reading flags, bq27x00_read() argument is inverted and causes
> reads 2 of bytes for bq27200 and 1 byte for bq27500, while their register
> sizes are 1 and 2 bytes respectively. This causes bq27500 upper flag
> bits always to be returned as 0, causing full charge state to never be
> reported correctly, so fix it.
> 
> Cc: Pali Rohár <pali.rohar@gmail.com>
> Cc: Lars-Peter Clausen <lars@metafoo.de>
> Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
> ---
>  drivers/power/bq27x00_battery.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/power/bq27x00_battery.c
> b/drivers/power/bq27x00_battery.c index 98bf567..86decb4 100644
> --- a/drivers/power/bq27x00_battery.c
> +++ b/drivers/power/bq27x00_battery.c
> @@ -312,7 +312,7 @@ static void bq27x00_update(struct bq27x00_device_info
> *di) struct bq27x00_reg_cache cache = {0, };
>  	bool is_bq27500 = di->chip == BQ27500;
> 
> -	cache.flags = bq27x00_read(di, BQ27x00_REG_FLAGS, is_bq27500);
> +	cache.flags = bq27x00_read(di, BQ27x00_REG_FLAGS, !is_bq27500);
>  	if (cache.flags >= 0) {
>  		if (!is_bq27500 && (cache.flags & BQ27000_FLAG_CI)) {
>  			dev_info(di->dev, "battery is not calibrated! ignoring capacity
> values\n");

Yes, you are right, this patch fixing flags register reading.
Anton Vorontsov, can you send this patch to linux 3.3?

-- 
Pali Rohár
pali.rohar@gmail.com

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] bq27x00_battery: fix flag register read

[Anton Vorontsov]

On Thu, Jan 19, 2012 at 02:49:03AM -0800, Pali Rohár wrote:
> On Saturday 14 January 2012 22:50:49 Grazvydas Ignotas wrote:
> > When reading flags, bq27x00_read() argument is inverted and causes
> > reads 2 of bytes for bq27200 and 1 byte for bq27500, while their register
> > sizes are 1 and 2 bytes respectively. This causes bq27500 upper flag
> > bits always to be returned as 0, causing full charge state to never be
> > reported correctly, so fix it.
> > 
> > Cc: Pali Rohár <pali.rohar@gmail.com>
> > Cc: Lars-Peter Clausen <lars@metafoo.de>
> > Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
> > ---
> >  drivers/power/bq27x00_battery.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/power/bq27x00_battery.c
> > b/drivers/power/bq27x00_battery.c index 98bf567..86decb4 100644
> > --- a/drivers/power/bq27x00_battery.c
> > +++ b/drivers/power/bq27x00_battery.c
> > @@ -312,7 +312,7 @@ static void bq27x00_update(struct bq27x00_device_info
> > *di) struct bq27x00_reg_cache cache = {0, };
> >  	bool is_bq27500 = di->chip == BQ27500;
> > 
> > -	cache.flags = bq27x00_read(di, BQ27x00_REG_FLAGS, is_bq27500);
> > +	cache.flags = bq27x00_read(di, BQ27x00_REG_FLAGS, !is_bq27500);
> >  	if (cache.flags >= 0) {
> >  		if (!is_bq27500 && (cache.flags & BQ27000_FLAG_CI)) {
> >  			dev_info(di->dev, "battery is not calibrated! ignoring capacity
> > values\n");
> 
> Yes, you are right, this patch fixing flags register reading.
> Anton Vorontsov, can you send this patch to linux 3.3?

Applied to battery-urgent.git, thanks guys!

-- 
Anton Vorontsov
Email: cbouatmailru@gmail.com