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

Commit dbb442b8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "USB: gadget: Allow function access to device ID data during bind()" 



This reverts commit 1ab83238.

Turns out this doesn't allow for the device ids to be overridden
properly, so we need to revert the thing.

Reported-by: default avatarJef Driesen <jefdriesen@telenet.be>
Cc: Robert Lukassen <Robert.Lukassen@tomtom.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ecc1624a

drivers/usb/gadget/composite.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -1107,14 +1107,6 @@ static int composite_bind(struct usb_gadget *gadget) 
	 */

	 */

	usb_ep_autoconfig_reset(cdev->gadget);

	usb_ep_autoconfig_reset(cdev->gadget);





	/* standardized runtime overrides for device ID data */

	if (idVendor)

		cdev->desc.idVendor = cpu_to_le16(idVendor);

	if (idProduct)

		cdev->desc.idProduct = cpu_to_le16(idProduct);

	if (bcdDevice)

		cdev->desc.bcdDevice = cpu_to_le16(bcdDevice);



	/* composite gadget needs to assign strings for whole device (like

	/* composite gadget needs to assign strings for whole device (like

	 * serial number), register function drivers, potentially update

	 * serial number), register function drivers, potentially update

	 * power state and consumption, etc

	 * power state and consumption, etc
@@ -1126,6 +1118,14 @@ static int composite_bind(struct usb_gadget *gadget) 
	cdev->desc = *composite->dev;

	cdev->desc = *composite->dev;

	cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket;

	cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket;





	/* standardized runtime overrides for device ID data */

	if (idVendor)

		cdev->desc.idVendor = cpu_to_le16(idVendor);

	if (idProduct)

		cdev->desc.idProduct = cpu_to_le16(idProduct);

	if (bcdDevice)

		cdev->desc.bcdDevice = cpu_to_le16(bcdDevice);



	/* stirng overrides */

	/* stirng overrides */

	if (iManufacturer || !cdev->desc.iManufacturer) {

	if (iManufacturer || !cdev->desc.iManufacturer) {

		if (!iManufacturer && !composite->iManufacturer &&

		if (!iManufacturer && !composite->iManufacturer &&