From bc3f7d894704a811ba3995464fb9985c61709ed2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 6 Apr 2020 19:56:27 +0200 Subject: [PATCH] 4.4-stable patches added patches: usb-gadget-printer-drop-unused-device-qualifier-descriptor.patch usb-gadget-uac2-drop-unused-device-qualifier-descriptor.patch --- queue-4.4/series | 2 + ...p-unused-device-qualifier-descriptor.patch | 42 +++++++++++++++++ ...p-unused-device-qualifier-descriptor.patch | 46 +++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 queue-4.4/usb-gadget-printer-drop-unused-device-qualifier-descriptor.patch create mode 100644 queue-4.4/usb-gadget-uac2-drop-unused-device-qualifier-descriptor.patch diff --git a/queue-4.4/series b/queue-4.4/series index e573f4228a8..f0ff9c77560 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -10,3 +10,5 @@ l2tp-fix-duplicate-session-creation.patch l2tp-refactor-the-codes-with-existing-macros-instead-of-literal-number.patch l2tp-ensure-sessions-are-freed-after-their-pppol2tp-socket.patch l2tp-fix-race-between-l2tp_session_delete-and-l2tp_tunnel_closeall.patch +usb-gadget-uac2-drop-unused-device-qualifier-descriptor.patch +usb-gadget-printer-drop-unused-device-qualifier-descriptor.patch diff --git a/queue-4.4/usb-gadget-printer-drop-unused-device-qualifier-descriptor.patch b/queue-4.4/usb-gadget-printer-drop-unused-device-qualifier-descriptor.patch new file mode 100644 index 00000000000..925b77db844 --- /dev/null +++ b/queue-4.4/usb-gadget-printer-drop-unused-device-qualifier-descriptor.patch @@ -0,0 +1,42 @@ +From e5a89162161d498170e7e39e6cfd2f71458c2b00 Mon Sep 17 00:00:00 2001 +From: Krzysztof Opasiak +Date: Sun, 22 May 2016 11:08:13 +0200 +Subject: usb: gadget: printer: Drop unused device qualifier descriptor + +From: Krzysztof Opasiak + +commit e5a89162161d498170e7e39e6cfd2f71458c2b00 upstream. + +This descriptor is never used. Currently device qualifier +descriptor is generated by compossite code, so no need to +keep it in function file. + +Signed-off-by: Krzysztof Opasiak +Signed-off-by: Krzysztof Opasiak +Signed-off-by: Felipe Balbi +Cc: Nick Desaulniers +Cc: Nathan Chancellor +Cc: kbuild test robot +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/gadget/function/f_printer.c | 8 -------- + 1 file changed, 8 deletions(-) + +--- a/drivers/usb/gadget/function/f_printer.c ++++ b/drivers/usb/gadget/function/f_printer.c +@@ -161,14 +161,6 @@ static struct usb_endpoint_descriptor hs + .wMaxPacketSize = cpu_to_le16(512) + }; + +-static struct usb_qualifier_descriptor dev_qualifier = { +- .bLength = sizeof(dev_qualifier), +- .bDescriptorType = USB_DT_DEVICE_QUALIFIER, +- .bcdUSB = cpu_to_le16(0x0200), +- .bDeviceClass = USB_CLASS_PRINTER, +- .bNumConfigurations = 1 +-}; +- + static struct usb_descriptor_header *hs_printer_function[] = { + (struct usb_descriptor_header *) &intf_desc, + (struct usb_descriptor_header *) &hs_ep_in_desc, diff --git a/queue-4.4/usb-gadget-uac2-drop-unused-device-qualifier-descriptor.patch b/queue-4.4/usb-gadget-uac2-drop-unused-device-qualifier-descriptor.patch new file mode 100644 index 00000000000..b4099ce3739 --- /dev/null +++ b/queue-4.4/usb-gadget-uac2-drop-unused-device-qualifier-descriptor.patch @@ -0,0 +1,46 @@ +From d4529f9be1d72919f75f76f31773c4e98d03ce6b Mon Sep 17 00:00:00 2001 +From: Krzysztof Opasiak +Date: Sun, 22 May 2016 11:08:14 +0200 +Subject: usb: gadget: uac2: Drop unused device qualifier descriptor + +From: Krzysztof Opasiak + +commit d4529f9be1d72919f75f76f31773c4e98d03ce6b upstream. + +This descriptor is never used. Currently device qualifier +descriptor is generated by compossite code so no need to +keep it in function file. + +Signed-off-by: Krzysztof Opasiak +Signed-off-by: Krzysztof Opasiak +Signed-off-by: Felipe Balbi +Cc: Nick Desaulniers +Cc: Nathan Chancellor +Cc: kbuild test robot +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/gadget/function/f_uac2.c | 12 ------------ + 1 file changed, 12 deletions(-) + +--- a/drivers/usb/gadget/function/f_uac2.c ++++ b/drivers/usb/gadget/function/f_uac2.c +@@ -598,18 +598,6 @@ static struct usb_gadget_strings *fn_str + NULL, + }; + +-static struct usb_qualifier_descriptor devqual_desc = { +- .bLength = sizeof devqual_desc, +- .bDescriptorType = USB_DT_DEVICE_QUALIFIER, +- +- .bcdUSB = cpu_to_le16(0x200), +- .bDeviceClass = USB_CLASS_MISC, +- .bDeviceSubClass = 0x02, +- .bDeviceProtocol = 0x01, +- .bNumConfigurations = 1, +- .bRESERVED = 0, +-}; +- + static struct usb_interface_assoc_descriptor iad_desc = { + .bLength = sizeof iad_desc, + .bDescriptorType = USB_DT_INTERFACE_ASSOCIATION, -- 2.47.3