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

Commit 2c7b871b authored by William Gulland's avatar William Gulland Committed by Greg Kroah-Hartman
Browse files

usb: Clear both buffers when clearing a control transfer TT buffer. 



Control transfers have both IN and OUT (or SETUP) packets, so when
clearing TT buffers for a control transfer it's necessary to send
two HUB_CLEAR_TT_BUFFER requests to the hub.

Signed-off-by: default avatarWilliam Gulland <wgulland@google.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 172d934c

drivers/usb/core/hub.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -668,6 +668,15 @@ static void hub_irq(struct urb *urb) 
static inline int

static inline int

hub_clear_tt_buffer (struct usb_device *hdev, u16 devinfo, u16 tt)

hub_clear_tt_buffer (struct usb_device *hdev, u16 devinfo, u16 tt)

{

{

	/* Need to clear both directions for control ep */

	if (((devinfo >> 11) & USB_ENDPOINT_XFERTYPE_MASK) ==

			USB_ENDPOINT_XFER_CONTROL) {

		int status = usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),

				HUB_CLEAR_TT_BUFFER, USB_RT_PORT,

				devinfo ^ 0x8000, tt, NULL, 0, 1000);

		if (status)

			return status;

	}

	return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),

	return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),

			       HUB_CLEAR_TT_BUFFER, USB_RT_PORT, devinfo,

			       HUB_CLEAR_TT_BUFFER, USB_RT_PORT, devinfo,

			       tt, NULL, 0, 1000);

			       tt, NULL, 0, 1000);