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

Commit 0aecfc1b authored by Igor Kotrasinski's avatar Igor Kotrasinski Committed by Felipe Balbi
Browse files

usb: gadget: composite: remove redundant bcdUSB setting in legacy 



Since composite now overwrites bcdUSB for any gadget, remove
setting it in legacy gadgets. All legacy gadgets set 0x0200, the
same as the value additionally set by composite, so there is no
behaviour change.

Signed-off-by: default avatarIgor Kotrasinski <i.kotrasinsk@samsung.com>

Rebase onto current balbi/next

Signed-off-by: default avatarKrzysztof Opasiak <k.opasiak@samsung.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 69b76cdf

drivers/usb/gadget/legacy/acm_ms.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static struct usb_device_descriptor device_desc = { 
	.bLength =		sizeof device_desc,

	.bDescriptorType =	USB_DT_DEVICE,



	.bcdUSB =		cpu_to_le16(0x0200),

	/* .bcdUSB = DYNAMIC */



	.bDeviceClass =		USB_CLASS_MISC /* 0xEF */,

	.bDeviceSubClass =	2,

drivers/usb/gadget/legacy/audio.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static struct usb_device_descriptor device_desc = { 
	.bLength =		sizeof device_desc,

	.bDescriptorType =	USB_DT_DEVICE,



	.bcdUSB =		cpu_to_le16(0x200),

	/* .bcdUSB = DYNAMIC */



#ifdef CONFIG_GADGET_UAC1

	.bDeviceClass =		USB_CLASS_PER_INTERFACE,

drivers/usb/gadget/legacy/cdc2.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static struct usb_device_descriptor device_desc = { 
	.bLength =		sizeof device_desc,

	.bDescriptorType =	USB_DT_DEVICE,



	.bcdUSB =		cpu_to_le16(0x0200),

	/* .bcdUSB = DYNAMIC */



	.bDeviceClass =		USB_CLASS_COMM,

	.bDeviceSubClass =	0,

drivers/usb/gadget/legacy/ether.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static struct usb_device_descriptor device_desc = { 
	.bLength =		sizeof device_desc,

	.bDescriptorType =	USB_DT_DEVICE,



	.bcdUSB =		cpu_to_le16 (0x0200),

	/* .bcdUSB = DYNAMIC */



	.bDeviceClass =		USB_CLASS_COMM,

	.bDeviceSubClass =	0,

drivers/usb/gadget/legacy/g_ffs.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static struct usb_device_descriptor gfs_dev_desc = { 
	.bLength		= sizeof gfs_dev_desc,

	.bDescriptorType	= USB_DT_DEVICE,



	.bcdUSB			= cpu_to_le16(0x0200),

	/* .bcdUSB = DYNAMIC */

	.bDeviceClass		= USB_CLASS_PER_INTERFACE,



	.idVendor		= cpu_to_le16(GFS_VENDOR_ID),