diff options
author | Johan Hovold <jhovold@gmail.com> | 2014-05-26 13:23:52 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-27 18:04:10 -0400 |
commit | df3ce23a56654bbf08e0c36ab1690cd8316a53c4 (patch) | |
tree | 980447c1f05c042225312b62db1ad0220ed38de9 /drivers/usb/wusbcore | |
parent | 0943d8ead30e9474034cc5e92225ab0fd29fd0d4 (diff) |
USB: wusbcore: fix control-pipe directions
Fix incorrect pipe directions in control requests (which has been
silently fixed up by USB core).
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/wusbcore')
-rw-r--r-- | drivers/usb/wusbcore/wa-rpipe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/wusbcore/wa-rpipe.c b/drivers/usb/wusbcore/wa-rpipe.c index 6d6da127f6de..a80c5d284b59 100644 --- a/drivers/usb/wusbcore/wa-rpipe.c +++ b/drivers/usb/wusbcore/wa-rpipe.c | |||
@@ -524,7 +524,7 @@ void rpipe_ep_disable(struct wahc *wa, struct usb_host_endpoint *ep) | |||
524 | u16 index = le16_to_cpu(rpipe->descr.wRPipeIndex); | 524 | u16 index = le16_to_cpu(rpipe->descr.wRPipeIndex); |
525 | 525 | ||
526 | usb_control_msg( | 526 | usb_control_msg( |
527 | wa->usb_dev, usb_rcvctrlpipe(wa->usb_dev, 0), | 527 | wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0), |
528 | USB_REQ_RPIPE_ABORT, | 528 | USB_REQ_RPIPE_ABORT, |
529 | USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_RPIPE, | 529 | USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_RPIPE, |
530 | 0, index, NULL, 0, USB_CTRL_SET_TIMEOUT); | 530 | 0, index, NULL, 0, USB_CTRL_SET_TIMEOUT); |
@@ -545,7 +545,7 @@ void rpipe_clear_feature_stalled(struct wahc *wa, struct usb_host_endpoint *ep) | |||
545 | u16 index = le16_to_cpu(rpipe->descr.wRPipeIndex); | 545 | u16 index = le16_to_cpu(rpipe->descr.wRPipeIndex); |
546 | 546 | ||
547 | usb_control_msg( | 547 | usb_control_msg( |
548 | wa->usb_dev, usb_rcvctrlpipe(wa->usb_dev, 0), | 548 | wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0), |
549 | USB_REQ_CLEAR_FEATURE, | 549 | USB_REQ_CLEAR_FEATURE, |
550 | USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_RPIPE, | 550 | USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_RPIPE, |
551 | RPIPE_STALL, index, NULL, 0, USB_CTRL_SET_TIMEOUT); | 551 | RPIPE_STALL, index, NULL, 0, USB_CTRL_SET_TIMEOUT); |