The Linux Kernel Mailing List
 help / color / mirror / Atom feed
* [PATCH] bq27x00_battery: fix bugs introduced with BQ27425 support
@ 2012-12-02  9:34 NeilBrown
  2013-01-06  2:59 ` Anton Vorontsov
  0 siblings, 1 reply; 2+ messages in thread
From: NeilBrown @ 2012-12-02  9:34 UTC (permalink / raw)
  To: Anton Vorontsov; +Cc: Lars-Peter Clausen, Saranya Gopal, David Woodhouse, lkml

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



commit a66f59ba2e994bf70274ef0513e24e0e7ae20c63
    bq27x00_battery: Add support for BQ27425 chip

introduced 2 bug.

1/ 'chip' was set to BQ27425 unconditionally - breaking support for
   other devices.
2/ BQ27425 does not support cycle count, how the code still tries to
   get the cycle count for BQ27425, and now does it twice for other chips.

Cc: Saranya Gopal <saranya.gopal@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index e2659f1..51d4017 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -445,7 +445,6 @@ static void bq27x00_update(struct bq27x00_device_info *di)
 		cache.temperature = bq27x00_battery_read_temperature(di);
 		if (!is_bq27425)
 			cache.cycle_count = bq27x00_battery_read_cyct(di);
-		cache.cycle_count = bq27x00_battery_read_cyct(di);
 		cache.power_avg =
 			bq27x00_battery_read_pwr_avg(di, BQ27x00_POWER_AVG);
 
@@ -697,7 +696,6 @@ static int bq27x00_powersupply_init(struct bq27x00_device_info *di)
 	int ret;
 
 	di->bat.type = POWER_SUPPLY_TYPE_BATTERY;
-	di->chip = BQ27425;
 	if (di->chip == BQ27425) {
 		di->bat.properties = bq27425_battery_props;
 		di->bat.num_properties = ARRAY_SIZE(bq27425_battery_props);

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] bq27x00_battery: fix bugs introduced with BQ27425 support
  2012-12-02  9:34 [PATCH] bq27x00_battery: fix bugs introduced with BQ27425 support NeilBrown
@ 2013-01-06  2:59 ` Anton Vorontsov
  0 siblings, 0 replies; 2+ messages in thread
From: Anton Vorontsov @ 2013-01-06  2:59 UTC (permalink / raw)
  To: NeilBrown; +Cc: Lars-Peter Clausen, Saranya Gopal, David Woodhouse, lkml

On Sun, Dec 02, 2012 at 08:34:21PM +1100, NeilBrown wrote:
> commit a66f59ba2e994bf70274ef0513e24e0e7ae20c63
>     bq27x00_battery: Add support for BQ27425 chip
> 
> introduced 2 bug.
> 
> 1/ 'chip' was set to BQ27425 unconditionally - breaking support for
>    other devices.
> 2/ BQ27425 does not support cycle count, how the code still tries to
>    get the cycle count for BQ27425, and now does it twice for other chips.
> 
> Cc: Saranya Gopal <saranya.gopal@intel.com>
> Signed-off-by: NeilBrown <neilb@suse.de>

Applied, thanks!

> diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
> index e2659f1..51d4017 100644
> --- a/drivers/power/bq27x00_battery.c
> +++ b/drivers/power/bq27x00_battery.c
> @@ -445,7 +445,6 @@ static void bq27x00_update(struct bq27x00_device_info *di)
>  		cache.temperature = bq27x00_battery_read_temperature(di);
>  		if (!is_bq27425)
>  			cache.cycle_count = bq27x00_battery_read_cyct(di);
> -		cache.cycle_count = bq27x00_battery_read_cyct(di);
>  		cache.power_avg =
>  			bq27x00_battery_read_pwr_avg(di, BQ27x00_POWER_AVG);
>  
> @@ -697,7 +696,6 @@ static int bq27x00_powersupply_init(struct bq27x00_device_info *di)
>  	int ret;
>  
>  	di->bat.type = POWER_SUPPLY_TYPE_BATTERY;
> -	di->chip = BQ27425;
>  	if (di->chip == BQ27425) {
>  		di->bat.properties = bq27425_battery_props;
>  		di->bat.num_properties = ARRAY_SIZE(bq27425_battery_props);

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-01-06  3:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-02  9:34 [PATCH] bq27x00_battery: fix bugs introduced with BQ27425 support NeilBrown
2013-01-06  2:59 ` Anton Vorontsov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox