Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62769157 authored by Thinh Nguyen's avatar Thinh Nguyen Committed by Greg Kroah-Hartman
Browse files

usb: gadget: composite: Inform controller driver of self-powered 



commit 5e5caf4fa8d3039140b4548b6ab23dd17fce9b2c upstream.

Different configuration/condition may draw different power. Inform the
controller driver of the change so it can respond properly (e.g.
GET_STATUS request). This fixes an issue with setting MaxPower from
configfs. The composite driver doesn't check this value when setting
self-powered.

Cc: stable@vger.kernel.org
Fixes: 88af8bbe ("usb: gadget: the start of the configfs interface")
Signed-off-by: default avatarThinh Nguyen <thinhn@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2ad53606

drivers/usb/gadget/composite.c

+9 −0
Original line number Diff line number Diff line
@@ -847,6 +847,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;
@@ -2265,6 +2270,7 @@ void composite_suspend(struct usb_gadget *gadget) 


	cdev->suspended = 1;



	usb_gadget_set_selfpowered(gadget);

	usb_gadget_vbus_draw(gadget, 2);

}
@@ -2293,6 +2299,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);

	}