From aaf199b1ed796e07be1ef7fb9ab483ae6c765901 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Sun, 2 Dec 2012 20:34:21 +1100 Subject: [PATCH] --- yaml --- r: 350599 b: refs/heads/master c: bde83b9a6b44c1e0fd872e57ecc869cfcf88538f h: refs/heads/master i: 350597: 67104079c3484d84eba79bded956a5fa24c706f7 350595: 36de686a501f7eaa4c2bef05dc82564a1d4e58d1 350591: 850b27cfb5732ca7b0092032dd366b10d5772c94 v: v3 --- [refs] | 2 +- trunk/drivers/power/bq27x00_battery.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f6a93cd4cdb1..bcadbf09481f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a05be99174edc9f258ee68140b71b9645ad977ee +refs/heads/master: bde83b9a6b44c1e0fd872e57ecc869cfcf88538f diff --git a/trunk/drivers/power/bq27x00_battery.c b/trunk/drivers/power/bq27x00_battery.c index 36b34efdafc9..7087d0d6a087 100644 --- a/trunk/drivers/power/bq27x00_battery.c +++ b/trunk/drivers/power/bq27x00_battery.c @@ -448,7 +448,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); @@ -696,7 +695,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);