diff options
| author | William Gulland <wgulland@google.com> | 2013-06-27 16:10:20 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-04 15:43:34 +0800 |
| commit | 94c3bbaf01202674a406d075429513e321a5b236 (patch) | |
| tree | f16010dad5e64a40cbe061e82787a082fe224d5a | |
| parent | 54b404671f9535d0bd6bf388686cc5f8ee245c36 (diff) | |
| download | kernel_samsung_smdk4412-94c3bbaf01202674a406d075429513e321a5b236.zip kernel_samsung_smdk4412-94c3bbaf01202674a406d075429513e321a5b236.tar.gz kernel_samsung_smdk4412-94c3bbaf01202674a406d075429513e321a5b236.tar.bz2 | |
usb: Clear both buffers when clearing a control transfer TT buffer.
commit 2c7b871b9102c497ba8f972aa5d38532f05b654d upstream.
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: William Gulland <wgulland@google.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/core/hub.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index be9cac6..cb98968 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -463,6 +463,15 @@ resubmit: static inline int 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), HUB_CLEAR_TT_BUFFER, USB_RT_PORT, devinfo, tt, NULL, 0, 1000); |