From ff6d4fd80049968ed54a42e9349b276ec797591f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 3 Jan 2017 21:02:16 +0100 Subject: [PATCH] remove broken usb gadget patch from 4.4 and 4.8 --- queue-4.4/series | 1 - ...ways-set-ep-mult-to-a-sensible-value.patch | 66 ------------------- queue-4.8/series | 1 - ...ways-set-ep-mult-to-a-sensible-value.patch | 66 ------------------- 4 files changed, 134 deletions(-) delete mode 100644 queue-4.4/usb-gadget-composite-always-set-ep-mult-to-a-sensible-value.patch delete mode 100644 queue-4.8/usb-gadget-composite-always-set-ep-mult-to-a-sensible-value.patch diff --git a/queue-4.4/series b/queue-4.4/series index 79f7e1a1d55..436ba77a593 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -9,7 +9,6 @@ usb-cdc-acm-add-device-id-for-gw-instek-afg-125.patch usb-hub-fix-auto-remount-of-safely-removed-or-ejected-usb-3-devices.patch usb-gadget-f_uac2-fix-error-handling-at-afunc_bind.patch usb-gadget-composite-correctly-initialize-ep-maxpacket.patch -usb-gadget-composite-always-set-ep-mult-to-a-sensible-value.patch usb-uhci-report-non-pme-wakeup-signalling-for-intel-hardware.patch alsa-usb-audio-add-quickcam-communicate-deluxe-s7500-to-volume_control_quirks.patch alsa-hiface-fix-m2tech-hiface-driver-sampling-rate-change.patch diff --git a/queue-4.4/usb-gadget-composite-always-set-ep-mult-to-a-sensible-value.patch b/queue-4.4/usb-gadget-composite-always-set-ep-mult-to-a-sensible-value.patch deleted file mode 100644 index 4b249caf74b..00000000000 --- a/queue-4.4/usb-gadget-composite-always-set-ep-mult-to-a-sensible-value.patch +++ /dev/null @@ -1,66 +0,0 @@ -From eaa496ffaaf19591fe471a36cef366146eeb9153 Mon Sep 17 00:00:00 2001 -From: Felipe Balbi -Date: Wed, 28 Sep 2016 12:33:31 +0300 -Subject: usb: gadget: composite: always set ep->mult to a sensible value - -From: Felipe Balbi - -commit eaa496ffaaf19591fe471a36cef366146eeb9153 upstream. - -ep->mult is supposed to be set to Isochronous and -Interrupt Endapoint's multiplier value. This value -is computed from different places depending on the -link speed. - -If we're dealing with HighSpeed, then it's part of -bits [12:11] of wMaxPacketSize. This case wasn't -taken into consideration before. - -While at that, also make sure the ep->mult defaults -to one so drivers can use it unconditionally and -assume they'll never multiply ep->maxpacket to zero. - -Signed-off-by: Felipe Balbi -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/usb/gadget/composite.c | 9 +++++++-- - drivers/usb/gadget/function/uvc_video.c | 2 +- - 2 files changed, 8 insertions(+), 3 deletions(-) - ---- a/drivers/usb/gadget/composite.c -+++ b/drivers/usb/gadget/composite.c -@@ -148,7 +148,12 @@ ep_found: - _ep->desc = chosen_desc; - _ep->comp_desc = NULL; - _ep->maxburst = 0; -- _ep->mult = 0; -+ _ep->mult = 1; -+ -+ if (g->speed == USB_SPEED_HIGH && (usb_endpoint_xfer_isoc(_ep->desc) || -+ usb_endpoint_xfer_int(_ep->desc))) -+ _ep->mult = usb_endpoint_maxp_mult(_ep->desc); -+ - if (!want_comp_desc) - return 0; - -@@ -165,7 +170,7 @@ ep_found: - switch (usb_endpoint_type(_ep->desc)) { - case USB_ENDPOINT_XFER_ISOC: - /* mult: bits 1:0 of bmAttributes */ -- _ep->mult = comp_desc->bmAttributes & 0x3; -+ _ep->mult = (comp_desc->bmAttributes & 0x3) + 1; - case USB_ENDPOINT_XFER_BULK: - case USB_ENDPOINT_XFER_INT: - _ep->maxburst = comp_desc->bMaxBurst + 1; ---- a/drivers/usb/gadget/function/uvc_video.c -+++ b/drivers/usb/gadget/function/uvc_video.c -@@ -243,7 +243,7 @@ uvc_video_alloc_requests(struct uvc_vide - - req_size = video->ep->maxpacket - * max_t(unsigned int, video->ep->maxburst, 1) -- * (video->ep->mult + 1); -+ * (video->ep->mult); - - for (i = 0; i < UVC_NUM_REQUESTS; ++i) { - video->req_buffer[i] = kmalloc(req_size, GFP_KERNEL); diff --git a/queue-4.8/series b/queue-4.8/series index e59aec508f6..84c2ead3e4d 100644 --- a/queue-4.8/series +++ b/queue-4.8/series @@ -15,7 +15,6 @@ usb-dwc3-gadget-set-pcm1-field-of-isochronous-first-trbs.patch usb-hub-fix-auto-remount-of-safely-removed-or-ejected-usb-3-devices.patch usb-gadget-f_uac2-fix-error-handling-at-afunc_bind.patch usb-gadget-composite-correctly-initialize-ep-maxpacket.patch -usb-gadget-composite-always-set-ep-mult-to-a-sensible-value.patch usb-uhci-report-non-pme-wakeup-signalling-for-intel-hardware.patch usbip-vudc-fix-clear-already_seen-flag-also-for-ep0.patch alsa-usb-audio-add-quickcam-communicate-deluxe-s7500-to-volume_control_quirks.patch diff --git a/queue-4.8/usb-gadget-composite-always-set-ep-mult-to-a-sensible-value.patch b/queue-4.8/usb-gadget-composite-always-set-ep-mult-to-a-sensible-value.patch deleted file mode 100644 index e074e5309cc..00000000000 --- a/queue-4.8/usb-gadget-composite-always-set-ep-mult-to-a-sensible-value.patch +++ /dev/null @@ -1,66 +0,0 @@ -From eaa496ffaaf19591fe471a36cef366146eeb9153 Mon Sep 17 00:00:00 2001 -From: Felipe Balbi -Date: Wed, 28 Sep 2016 12:33:31 +0300 -Subject: usb: gadget: composite: always set ep->mult to a sensible value - -From: Felipe Balbi - -commit eaa496ffaaf19591fe471a36cef366146eeb9153 upstream. - -ep->mult is supposed to be set to Isochronous and -Interrupt Endapoint's multiplier value. This value -is computed from different places depending on the -link speed. - -If we're dealing with HighSpeed, then it's part of -bits [12:11] of wMaxPacketSize. This case wasn't -taken into consideration before. - -While at that, also make sure the ep->mult defaults -to one so drivers can use it unconditionally and -assume they'll never multiply ep->maxpacket to zero. - -Signed-off-by: Felipe Balbi -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/usb/gadget/composite.c | 9 +++++++-- - drivers/usb/gadget/function/uvc_video.c | 2 +- - 2 files changed, 8 insertions(+), 3 deletions(-) - ---- a/drivers/usb/gadget/composite.c -+++ b/drivers/usb/gadget/composite.c -@@ -201,7 +201,12 @@ ep_found: - _ep->desc = chosen_desc; - _ep->comp_desc = NULL; - _ep->maxburst = 0; -- _ep->mult = 0; -+ _ep->mult = 1; -+ -+ if (g->speed == USB_SPEED_HIGH && (usb_endpoint_xfer_isoc(_ep->desc) || -+ usb_endpoint_xfer_int(_ep->desc))) -+ _ep->mult = usb_endpoint_maxp_mult(_ep->desc); -+ - if (!want_comp_desc) - return 0; - -@@ -218,7 +223,7 @@ ep_found: - switch (usb_endpoint_type(_ep->desc)) { - case USB_ENDPOINT_XFER_ISOC: - /* mult: bits 1:0 of bmAttributes */ -- _ep->mult = comp_desc->bmAttributes & 0x3; -+ _ep->mult = (comp_desc->bmAttributes & 0x3) + 1; - case USB_ENDPOINT_XFER_BULK: - case USB_ENDPOINT_XFER_INT: - _ep->maxburst = comp_desc->bMaxBurst + 1; ---- a/drivers/usb/gadget/function/uvc_video.c -+++ b/drivers/usb/gadget/function/uvc_video.c -@@ -243,7 +243,7 @@ uvc_video_alloc_requests(struct uvc_vide - - req_size = video->ep->maxpacket - * max_t(unsigned int, video->ep->maxburst, 1) -- * (video->ep->mult + 1); -+ * (video->ep->mult); - - for (i = 0; i < UVC_NUM_REQUESTS; ++i) { - video->req_buffer[i] = kmalloc(req_size, GFP_KERNEL); -- 2.47.3