Merge "usb: gadget: composite: Allow vbus_draw() to be called with 0mA" (a38c0138) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/usb/gadget/composite.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -944,7 +944,11 @@ static int set_config(struct usb_composite_dev *cdev,
		}

		/* when we return, be sure our power usage is valid */
		power = c->MaxPower ? c->MaxPower : CONFIG_USB_GADGET_VBUS_DRAW;
		if (c->MaxPower \|\| (c->bmAttributes & USB_CONFIG_ATT_SELFPOWER))
		power = c->MaxPower;
		else
		power = CONFIG_USB_GADGET_VBUS_DRAW;

		if (gadget->speed < USB_SPEED_SUPER)
		power = min(power, 500U);
		else