[PATCH] usb: gadget: composite: fixup bad backport

[PATCH] usb: gadget: composite: fixup bad backport

[Felipe Balbi]

While backporting commit eaa496ffaaf19591fe471a36cef366146eeb91538, I
made a mistake and instead of extracting bits 12:11 from wMaxPacketSize,
I extracted bits 10:0. This was reported by Bin Liu recently as can be
seen at [1].

This patch is a quick fixup patch to extract the correct bits from
wMaxPacketSize.

[1] https://marc.info/?i=20170111171305.GB18730@uda027190

Cc: <stable@vger.kernel.org>
Reported-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
---

Greg, let me know if this is okay. If you prefer a revert followed by
the correct patch, I can do that. No issues.

 drivers/usb/gadget/composite.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index e38b21087d26..34ee6ef642cd 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -205,7 +205,7 @@ int config_ep_by_speed(struct usb_gadget *g,
 
 	if (g->speed == USB_SPEED_HIGH && (usb_endpoint_xfer_isoc(_ep->desc) ||
 				usb_endpoint_xfer_int(_ep->desc)))
-		_ep->mult = usb_endpoint_maxp(_ep->desc) & 0x7ff;
+		_ep->mult = (usb_endpoint_maxp(_ep->desc) & 0x1800) >> 11;
 
 	if (!want_comp_desc)
 		return 0;
-- 
2.11.0.295.gd7dffce1ce

Re: [PATCH] usb: gadget: composite: fixup bad backport

[Greg Kroah-Hartman]

On Thu, Jan 12, 2017 at 09:41:57AM +0200, Felipe Balbi wrote:
> While backporting commit eaa496ffaaf19591fe471a36cef366146eeb91538, I
> made a mistake and instead of extracting bits 12:11 from wMaxPacketSize,
> I extracted bits 10:0. This was reported by Bin Liu recently as can be
> seen at [1].
> 
> This patch is a quick fixup patch to extract the correct bits from
> wMaxPacketSize.
> 
> [1] https://marc.info/?i=20170111171305.GB18730@uda027190
> 
> Cc: <stable@vger.kernel.org>
> Reported-by: Bin Liu <b-liu@ti.com>
> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
> ---
> 
> Greg, let me know if this is okay. If you prefer a revert followed by
> the correct patch, I can do that. No issues.

Ah, our emails just crossed, and I had just done the revert.  If you
could send a fixed up patch now, that would be great.

thanks,

greg k-h

Re: [PATCH] usb: gadget: composite: fixup bad backport

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 980 bytes --]


Hi,

Greg Kroah-Hartman <gregkh@linuxfoundation.org> writes:
> On Thu, Jan 12, 2017 at 09:41:57AM +0200, Felipe Balbi wrote:
>> While backporting commit eaa496ffaaf19591fe471a36cef366146eeb91538, I
>> made a mistake and instead of extracting bits 12:11 from wMaxPacketSize,
>> I extracted bits 10:0. This was reported by Bin Liu recently as can be
>> seen at [1].
>> 
>> This patch is a quick fixup patch to extract the correct bits from
>> wMaxPacketSize.
>> 
>> [1] https://marc.info/?i=20170111171305.GB18730@uda027190
>> 
>> Cc: <stable@vger.kernel.org>
>> Reported-by: Bin Liu <b-liu@ti.com>
>> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
>> ---
>> 
>> Greg, let me know if this is okay. If you prefer a revert followed by
>> the correct patch, I can do that. No issues.
>
> Ah, our emails just crossed, and I had just done the revert.  If you
> could send a fixed up patch now, that would be great.

Done, thanks :-)

-- 
balbi

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]