aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-09-19 18:28:10 +0100
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-09-19 18:29:57 +0100
commit1a05356029493b29f866cf04f7550243ef3ae687 (patch)
tree9447c2d4f7497b3a79d05bc3319b54d8ddfe33cd /drivers
parent647140680cef5d6391d2b430c881c57904454696 (diff)
downloadkernel_samsung_smdk4412-1a05356029493b29f866cf04f7550243ef3ae687.zip
kernel_samsung_smdk4412-1a05356029493b29f866cf04f7550243ef3ae687.tar.gz
kernel_samsung_smdk4412-1a05356029493b29f866cf04f7550243ef3ae687.tar.bz2
max77693: Standardize the output of the "online" property
Return "0" when no power supply is present Fixes CYAN-2138 Change-Id: I4a4391a454e8e1c5681f8a27ce498f77b4934e28
Diffstat (limited to 'drivers')
-rw-r--r--drivers/battery/max77693_charger.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/battery/max77693_charger.c b/drivers/battery/max77693_charger.c
index 35289a6..98fc901 100644
--- a/drivers/battery/max77693_charger.c
+++ b/drivers/battery/max77693_charger.c
@@ -1376,6 +1376,10 @@ static int max77693_charger_get_property(struct power_supply *psy,
val->intval = max77693_get_online_type(chg_data);
#else
val->intval = max77693_get_cable_type(chg_data);
+ if (val->intval == POWER_SUPPLY_TYPE_BATTERY) {
+ /* Userspace expects 0 for no-supply */
+ val->intval = 0;
+ }
#endif
break;
case POWER_SUPPLY_PROP_CURRENT_MAX: