diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/battery/max77693_charger.c | 4 | ||||
| -rw-r--r-- | drivers/power/power_supply_sysfs.c | 2 |
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" }; |