: Fix error handling in max17042 fuel gauge
MyungJoo Ham
Acked-bySender : Ramakrishna Pallala<[email protected]> Date : 2011-09-02 15:45 (GMT+09:00)
Quoted 5 lines
In
max17042_get_property(...), the values returned bymax17042_read_regare directly assigned to the variables, even if the read results in an error.
Quoted 8 lines
This patch checks for the return code from
max17042_read_regand exits the function if there is any error.Signed-off-by Ramakrishna Pallala---
drivers/power/max17042_battery.c| 85 ++++++++++++++++++++++++++------------1 files changed, 58 insertions(+), 27 deletions(-)
Hi MyungJoo,
Quoted 17 lines
-----Original Message-----
From: MyungJoo Ham [mailto:[email protected]]
Sent: Monday, September 05, 2011 6:55 AM
To: Pallala, Ramakrishna; [email protected]
Cc: Anton Vorontsov; [email protected]; 박경민; Wolfram Sang; R, Durgadoss
Subject: Re: [PATCHv1 1/1] [Power Supply]: Fix error handling in max17042 fuel gaugeSender : Ramakrishna Pallala<[email protected]> Date : 2011-09-02 15:45 (GMT+09:00)
Quoted 8 lines
In
max17042_get_property(...), the values returned bymax17042_read_regare directly assigned to the variables, even if the read results in an error.This patch checks for the return code from
max17042_read_regand exits the function if there is any error.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Ramakrishna Pallala---
drivers/power/max17042_battery.c| 85 ++++++++++++++++++++++++++------------1 files changed, 58 insertions(+), 27 deletions(-)Acked-by MyungJoo Ham <[email protected]>
Thanks for the Ack.
When can I expect the patch to be merged ?
Thanks,
Ram �淸�{.n�+돴윯돪�+%듚�깁負쪐w��{.n�+돴쪐{깸G쳺��{ay����,j�f"톒쉹��묎�z_溫(�쉸듶줷"얎�m����G쳺�◀?솳鈺�&x�~뤳턨O뺞촾퇉v�^�m����띠�◀?뻀�
Anton Vorontsov
Acked-by MyungJoo HamQuoted 13 lines · Ramakrishna
Quoted 13 lines
Quoted 12 lines
In
max17042_get_property(...), the values returned bymax17042_read_regare directly assigned to the variables, even if the read results in an error.This patch checks for the return code from
max17042_read_regand exits the function if there is any error.Signed-off-by Ramakrishna Pallala---
drivers/power/max17042_battery.c| 85 ++++++++++++++++++++++++++------------1 files changed, 58 insertions(+), 27 deletions(-)
Quoted 4 lines
Quoted 1 line
Acked-by MyungJoo Ham <[email protected]>Thanks for the Ack.
When can I expect the patch to be merged ?
Merged, much thanks!
Note that I had to manually fix conflicts with
commit cf7a8c03db792894f436db5f3ffc44d947b9b068 Author: MyungJoo Ham <[email protected]> Date: Wed Aug 17 10:18:34 2011 +0900 max17042_battery: Bugfix of incorrect voltage register value interpretation
So, the resulting patch in battery-2.6.git tree as follows, please check if everything is OK:
- - - -
From: Ramakrishna Pallala <[email protected]>
Date: Sat, 26 Nov 2011 04:11:15 +0400
Subject: [PATCH] max17042_battery: Fix error handling
In max17042_get_property(...), the values returned by max17042_read_reg are directly assigned to the variables, even if the read results in an error.
This patch checks for the return code from max17042_read_reg and exits the function if there is any error.
--- drivers/power/max17042_battery.c | 85 ++++++++++++++++++++++++++------------ 1 files changed, 58 insertions(+), 27 deletions(-)
drivers/power/max17042_battery.c +58 -27
@@ -84,55 +84,79 @@ static int max17042_get_property(struct power_supply *psy, {struct max17042_chip *chip =container_of (psy, struct max17042_chip, battery); +int ret;switch (psp) {case POWER_SUPPLY_PROP_PRESENT : - val->intval =max17042_read_reg (chip->client, -MAX17042_STATUS ); -if (val->intval & MAX17042_STATUS_BattAbsent) + ret =max17042_read_reg (chip->client,MAX17042_STATUS ); +if (ret <0 ) +return ret; + +if (ret & MAX17042_STATUS_BattAbsent) val->intval =0 ;else val->intval =1 ;break ;case POWER_SUPPLY_PROP_CYCLE_COUNT : - val->intval =max17042_read_reg (chip->client, - MAX17042_Cycles); + ret =max17042_read_reg (chip->client, MAX17042_Cycles); +if (ret <0 ) +return ret; + + val->intval = ret;break ;case POWER_SUPPLY_PROP_VOLTAGE_MAX : - val->intval =max17042_read_reg (chip->client, - MAX17042_MinMaxVolt); - val->intval >>=8 ; + ret =max17042_read_reg (chip->client, MAX17042_MinMaxVolt); +if (ret <0 ) +return ret; + + val->intval = ret >>8 ; val->intval *=20000 ;/* Units of LSB = 20mV */ break ;case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN : - val->intval =max17042_read_reg (chip->client, - MAX17042_V_empty); - val->intval >>=7 ; + ret =max17042_read_reg (chip->client, MAX17042_V_empty); +if (ret <0 ) +return ret; + + val->intval = ret >>7 ; val->intval *=10000 ;/* Units of LSB = 10mV */ break ;case POWER_SUPPLY_PROP_VOLTAGE_NOW : - val->intval =max17042_read_reg (chip->client,MAX17042_VCELL ) - *625 /8 ; + ret =max17042_read_reg (chip->client,MAX17042_VCELL ); +if (ret <0 ) +return ret; + + val->intval = ret *625 /8 ;break ;case POWER_SUPPLY_PROP_VOLTAGE_AVG : - val->intval =max17042_read_reg (chip->client, MAX17042_AvgVCELL) - *625 /8 ; + ret =max17042_read_reg (chip->client, MAX17042_AvgVCELL); +if (ret <0 ) +return ret; + + val->intval = ret *625 /8 ;break ;case POWER_SUPPLY_PROP_CAPACITY : - val->intval =max17042_read_reg (chip->client, -MAX17042_SOC ) /256 ; + ret =max17042_read_reg (chip->client,MAX17042_SOC ); +if (ret <0 ) +return ret; + + val->intval = ret >>8 ;break ;case POWER_SUPPLY_PROP_CHARGE_FULL : - val->intval =max17042_read_reg (chip->client, - MAX17042_RepSOC); -if ((val->intval /256 ) >=MAX17042_BATTERY_FULL ) + ret =max17042_read_reg (chip->client, MAX17042_RepSOC); +if (ret <0 ) +return ret; + +if ((ret >>8 ) >=MAX17042_BATTERY_FULL ) val->intval =1 ; -else if (val->intval >=0 ) +else if (ret >=0 ) val->intval =0 ;break ;case POWER_SUPPLY_PROP_TEMP : - val->intval =max17042_read_reg (chip->client, -MAX17042_TEMP ); + ret =max17042_read_reg (chip->client,MAX17042_TEMP ); +if (ret <0 ) +return ret; + + val->intval = ret;/* The value is signed. */ if (val->intval &0x8000 ) { val->intval = (0x7fff & ~val->intval) +1 ;
@@ -144,8 +168,11 @@ static int max17042_get_property(struct power_supply *psy,break ;case POWER_SUPPLY_PROP_CURRENT_NOW :if (chip->pdata->enable_current_sense) { - val->intval =max17042_read_reg (chip->client, - MAX17042_Current); + ret =max17042_read_reg (chip->client, MAX17042_Current); +if (ret <0 ) +return ret; + + val->intval = ret;if (val->intval &0x8000 ) {/* Negative */ val->intval = ~val->intval &0x7fff ;
@@ -159,8 +186,12 @@ static int max17042_get_property(struct power_supply *psy,break ;case POWER_SUPPLY_PROP_CURRENT_AVG :if (chip->pdata->enable_current_sense) { - val->intval =max17042_read_reg (chip->client, - MAX17042_AvgCurrent); + ret =max17042_read_reg (chip->client, + MAX17042_AvgCurrent); +if (ret <0 ) +return ret; + + val->intval = ret;if (val->intval &0x8000 ) {/* Negative */ val->intval = ~val->intval &0x7fff ;
Signature · 1 line
1.7.5.3
Quoted 40 lines
-----Original Message-----
From: Anton Vorontsov [mailto:[email protected]]
Sent: Saturday, November 26, 2011 5:46 AM
To: Pallala, Ramakrishna
Cc: [email protected]; [email protected]; [email protected]; �ڰ���; Wolfram Sang; R, Durgadoss
Subject: Re: [PATCHv1 1/1] [Power Supply]: Fix error handling in max17042 fuel gaugeQuoted 13 lines · Ramakrishna
Quoted 13 lines
Quoted 12 lines
In
max17042_get_property(...), the values returned bymax17042_read_regare directly assigned to the variables, even if the read results in an error.This patch checks for the return code from
max17042_read_regand exits the function if there is any error.Signed-off-by Ramakrishna Pallala---
drivers/power/max17042_battery.c| 85 ++++++++++++++++++++++++++------------1 files changed, 58 insertions(+), 27 deletions(-)Quoted 4 lines
Quoted 1 line
Acked-by MyungJoo Ham <[email protected]>Thanks for the Ack.
When can I expect the patch to be merged ?Merged, much thanks!
Note that I had to manually fix conflicts with
commit cf7a8c03db792894f436db5f3ffc44d947b9b068 Author: MyungJoo Ham <[email protected]> Date: Wed Aug 17 10:18:34 2011 +0900 max17042_battery: Bugfix of incorrect voltage register value interpretation
Quoted 2 lines
So, the resulting patch in battery-2.6.git tree as follows, please check if everything is OK:
The patch looks good.
Thanks for resolving the conflicts :)
Thanks,
Ram ���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�