aboutsummaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorKalle Komierowski <karl.komierowski@stericsson.com>2011-01-25 14:44:38 +0100
committerJonas ABERG <jonas.aberg@stericsson.com>2011-01-26 12:55:32 +0100
commit977021fe0d800785de89b7add4d1d3465d9386d1 (patch)
tree40c5162482e1796972f85f96849d30583cdaa61d /drivers/power
parenta76b5431c82923ff3ff210aacfe200543ff21e70 (diff)
power: ab8500_bm: Coverity error fixes
Some minor errors reported by Coverity fixed.. ST-Ericsson ID: ER 321097 Change-Id: I2ff9504e82cc882cf1d7220438a634dccec29550 Signed-off-by: Kalle Komierowski <karl.komierowski@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/13503 Reviewed-by: Johan PALSSON <johan.palsson@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/ab8500_chargalg.c6
-rw-r--r--drivers/power/ab8500_charger.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/power/ab8500_chargalg.c b/drivers/power/ab8500_chargalg.c
index efc6cb3d2c0..6a35841774f 100644
--- a/drivers/power/ab8500_chargalg.c
+++ b/drivers/power/ab8500_chargalg.c
@@ -1317,11 +1317,15 @@ static ssize_t ab8500_chargalg_sysfs_charger(struct kobject *kobj,
struct ab8500_chargalg, chargalg_kobject);
long int param;
int ac_usb;
+ int ret;
char entry = *attr->name;
switch (entry) {
case 'c':
- strict_strtol(buf, 10, &param);
+ ret = strict_strtol(buf, 10, &param);
+ if (ret < 0)
+ return ret;
+
ac_usb = param;
switch (ac_usb) {
case 0:
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index c75eed3c775..e7ebd92e7a3 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -435,7 +435,6 @@ static int ab8500_charger_max_usb_curr(struct ab8500_charger *di,
di->max_usb_in_curr = USB_CH_IP_CUR_LVL_1P5;
break;
case USB_STAT_HM_IDGND:
- ret = USB_STAT_HM_IDGND;
case USB_STAT_NOT_CONFIGURED:
case USB_STAT_RESERVED:
case USB_STAT_NOT_VALID_LINK:
@@ -1377,6 +1376,7 @@ static void ab8500_charger_usb_state_changed_work(struct work_struct *work)
* of 1sec for enabling charging
*/
msleep(1000);
+ /* Intentional fall through */
case AB8500_BM_USB_STATE_CONFIGURED:
/*
* USB is configured, enable charging with the charging