aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-09-19 18:35:39 +0100
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-09-19 19:07:36 +0100
commite531c03040b9ad3a86d3b751fb47b3362d85f373 (patch)
tree5e95bf1d99a6cf33c0e0f63427a6c5856e98c2c9 /drivers
parent1a05356029493b29f866cf04f7550243ef3ae687 (diff)
downloadkernel_samsung_smdk4412-e531c03040b9ad3a86d3b751fb47b3362d85f373.zip
kernel_samsung_smdk4412-e531c03040b9ad3a86d3b751fb47b3362d85f373.tar.gz
kernel_samsung_smdk4412-e531c03040b9ad3a86d3b751fb47b3362d85f373.tar.bz2
Revert "max77693: Standardize the output of the "online" property"
This reverts commit 1a05356029493b29f866cf04f7550243ef3ae687, the enumerator breakage introduced by change Iafbd9fb45253b02d539ac0ba114f57b3bf9eeed4 can be reverted cleanly without further impact and it's a cleaner fix Change-Id: I351c320f98691241fbe321a0b1ac54152802deb4
Diffstat (limited to 'drivers')
-rw-r--r--drivers/battery/max77693_charger.c4
-rw-r--r--drivers/power/power_supply_sysfs.c2
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/battery/max77693_charger.c b/drivers/battery/max77693_charger.c
index 98fc901..35289a6 100644
--- a/drivers/battery/max77693_charger.c
+++ b/drivers/battery/max77693_charger.c
@@ -1376,10 +1376,6 @@ 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:
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index a647e74..a5235ab 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -42,7 +42,7 @@ static ssize_t power_supply_show_property(struct device *dev,
struct device_attribute *attr,
char *buf) {
static char *type_text[] = {
- "Unknown", "Battery", "UPS", "Mains", "USB",
+ "Battery", "UPS", "Mains", "USB",
"USB_DCP", "USB_CDP", "USB_ACA",
"DOCK", "MISC", "WIRELESS", "OTG"
};