Merge "usb: gadget: composite: Inform controller driver of self-powered" (e4bb6fdb) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/usb/gadget/composite.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -906,6 +906,11 @@ static int set_config(struct usb_composite_dev *cdev,
		else
		power = min(power, 900U);
		done:
		if (power <= USB_SELF_POWER_VBUS_MAX_DRAW)
		usb_gadget_set_selfpowered(gadget);
		else
		usb_gadget_clear_selfpowered(gadget);

		usb_gadget_vbus_draw(gadget, power);
		if (result >= 0 && cdev->delayed_status)
		result = USB_GADGET_DELAYED_STATUS;
		@@ -2330,6 +2335,7 @@ void composite_suspend(struct usb_gadget *gadget)

		cdev->suspended = 1;

		usb_gadget_set_selfpowered(gadget);
		usb_gadget_vbus_draw(gadget, 2);
		}

		@@ -2358,6 +2364,9 @@ void composite_resume(struct usb_gadget *gadget)
		else
		maxpower = min(maxpower, 900U);

		if (maxpower > USB_SELF_POWER_VBUS_MAX_DRAW)
		usb_gadget_clear_selfpowered(gadget);

		usb_gadget_vbus_draw(gadget, maxpower);
		}