Commit 6dabeb89 authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Greg Kroah-Hartman

USB: dummy-hcd: use usb_urb_dir_in instead of usb_pipein

Commit fea34091 ("USB: add direction bit to urb->transfer_flags") has
added a usb_urb_dir_in() helper function that can be used to determine
the direction of the URB. With that patch USB_DIR_IN control requests with
wLength == 0 are considered out requests by real USB HCDs. This patch
changes dummy-hcd to use the usb_urb_dir_in() helper to match that
behavior.
Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Link: https://lore.kernel.org/r/4ae9e68ebca02f08a93ac61fe065057c9a01f0a8.1571667489.git.andreyknvl@google.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8442b02b
...@@ -1321,7 +1321,7 @@ static int dummy_perform_transfer(struct urb *urb, struct dummy_request *req, ...@@ -1321,7 +1321,7 @@ static int dummy_perform_transfer(struct urb *urb, struct dummy_request *req,
u32 this_sg; u32 this_sg;
bool next_sg; bool next_sg;
to_host = usb_pipein(urb->pipe); to_host = usb_urb_dir_in(urb);
rbuf = req->req.buf + req->req.actual; rbuf = req->req.buf + req->req.actual;
if (!urb->num_sgs) { if (!urb->num_sgs) {
...@@ -1409,7 +1409,7 @@ static int transfer(struct dummy_hcd *dum_hcd, struct urb *urb, ...@@ -1409,7 +1409,7 @@ static int transfer(struct dummy_hcd *dum_hcd, struct urb *urb,
/* FIXME update emulated data toggle too */ /* FIXME update emulated data toggle too */
to_host = usb_pipein(urb->pipe); to_host = usb_urb_dir_in(urb);
if (unlikely(len == 0)) if (unlikely(len == 0))
is_short = 1; is_short = 1;
else { else {
...@@ -1830,7 +1830,7 @@ static void dummy_timer(struct timer_list *t) ...@@ -1830,7 +1830,7 @@ static void dummy_timer(struct timer_list *t)
/* find the gadget's ep for this request (if configured) */ /* find the gadget's ep for this request (if configured) */
address = usb_pipeendpoint (urb->pipe); address = usb_pipeendpoint (urb->pipe);
if (usb_pipein(urb->pipe)) if (usb_urb_dir_in(urb))
address |= USB_DIR_IN; address |= USB_DIR_IN;
ep = find_endpoint(dum, address); ep = find_endpoint(dum, address);
if (!ep) { if (!ep) {
...@@ -2385,7 +2385,7 @@ static inline ssize_t show_urb(char *buf, size_t size, struct urb *urb) ...@@ -2385,7 +2385,7 @@ static inline ssize_t show_urb(char *buf, size_t size, struct urb *urb)
s = "?"; s = "?";
break; break;
} s; }), } s; }),
ep, ep ? (usb_pipein(urb->pipe) ? "in" : "out") : "", ep, ep ? (usb_urb_dir_in(urb) ? "in" : "out") : "",
({ char *s; \ ({ char *s; \
switch (usb_pipetype(urb->pipe)) { \ switch (usb_pipetype(urb->pipe)) { \
case PIPE_CONTROL: \ case PIPE_CONTROL: \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment