Merge "USB: gadget: composite: Allow bMaxPower=0 if self-powered"

This commit is contained in:
qctecmdr 2020-08-17 03:53:40 -07:00 • committed by Gerrit - the friendly Code Review server
commit a553896366

View file

@ -520,7 +520,7 @@ static u8 encode_bMaxPower(enum usb_device_speed speed,
{
unsigned val;
if (c->MaxPower)
if (c->MaxPower || (c->bmAttributes & USB_CONFIG_ATT_SELFPOWER))
val = c->MaxPower;
else
val = CONFIG_USB_GADGET_VBUS_DRAW;