diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-15 22:59:03 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-15 22:59:03 -0800 |
| commit | 3b3474037bf1f15cd30129d97633caa6154baca6 (patch) | |
| tree | 3f3bddca0b65fa884b3bbc335beb6e09d854599b | |
| parent | 7ce352665f13be28fbefc42273b29d257f3ee8d4 (diff) | |
| parent | de2b9b133098f89abccd5403473479250430415c (diff) | |
Merge "usb: gadget: Don't override config->MaxPower if specified"
| -rw-r--r-- | drivers/usb/gadget/composite.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index bf9730884235..c2dac015c501 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -486,14 +486,19 @@ done: static u8 encode_bMaxPower(enum usb_device_speed speed, struct usb_configuration *c) { - unsigned val = CONFIG_USB_GADGET_VBUS_DRAW; + unsigned val = c->MaxPower; switch (speed) { case USB_SPEED_SUPER: - /* with super-speed report 900mA */ - val = SSUSB_GADGET_VBUS_DRAW; + /* with super-speed report 900mA if user hasn't specified */ + if (!val) + val = SSUSB_GADGET_VBUS_DRAW; + return (u8)(val / SSUSB_GADGET_VBUS_DRAW_UNITS); default: + if (!val) + val = CONFIG_USB_GADGET_VBUS_DRAW; + return DIV_ROUND_UP(val, HSUSB_GADGET_VBUS_DRAW_UNITS); } } |