projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'icc-5.4-rc1' of https://git.linaro.org/people/georgi.djakov/linux into...
[linux-2.6-microblaze.git]
/
drivers
/
power
/
supply
/
ab8500_charger.c
diff --git
a/drivers/power/supply/ab8500_charger.c
b/drivers/power/supply/ab8500_charger.c
index
30de448
..
86d88ae
100644
(file)
--- a/
drivers/power/supply/ab8500_charger.c
+++ b/
drivers/power/supply/ab8500_charger.c
@@
-742,6
+742,7
@@
static int ab8500_charger_max_usb_curr(struct ab8500_charger *di,
USB_CH_IP_CUR_LVL_1P5;
break;
}
+ /* Else, fall through */
case USB_STAT_HM_IDGND:
dev_err(di->dev, "USB Type - Charging not allowed\n");
di->max_usb_in_curr.usb_type_max = USB_CH_IP_CUR_LVL_0P05;