USB: dummy-hcd: use usb_urb_dir_in instead of usb_pipein
Commit fea3409112a9 ("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: Andrey Konovalov <andreyknvl@google.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
parent
1bff4a4e66
commit
15ac1d99b8
@ -1321,7 +1321,7 @@ static int dummy_perform_transfer(struct urb *urb, struct dummy_request *req,
|
||||
u32 this_sg;
|
||||
bool next_sg;
|
||||
|
||||
to_host = usb_pipein(urb->pipe);
|
||||
to_host = usb_urb_dir_in(urb);
|
||||
rbuf = req->req.buf + req->req.actual;
|
||||
|
||||
if (!urb->num_sgs) {
|
||||
@ -1409,7 +1409,7 @@ top:
|
||||
|
||||
/* FIXME update emulated data toggle too */
|
||||
|
||||
to_host = usb_pipein(urb->pipe);
|
||||
to_host = usb_urb_dir_in(urb);
|
||||
if (unlikely(len == 0))
|
||||
is_short = 1;
|
||||
else {
|
||||
@ -1830,7 +1830,7 @@ restart:
|
||||
|
||||
/* find the gadget's ep for this request (if configured) */
|
||||
address = usb_pipeendpoint (urb->pipe);
|
||||
if (usb_pipein(urb->pipe))
|
||||
if (usb_urb_dir_in(urb))
|
||||
address |= USB_DIR_IN;
|
||||
ep = find_endpoint(dum, address);
|
||||
if (!ep) {
|
||||
@ -2385,7 +2385,7 @@ static inline ssize_t show_urb(char *buf, size_t size, struct urb *urb)
|
||||
s = "?";
|
||||
break;
|
||||
} s; }),
|
||||
ep, ep ? (usb_pipein(urb->pipe) ? "in" : "out") : "",
|
||||
ep, ep ? (usb_urb_dir_in(urb) ? "in" : "out") : "",
|
||||
({ char *s; \
|
||||
switch (usb_pipetype(urb->pipe)) { \
|
||||
case PIPE_CONTROL: \
|
||||
|
Loading…
x
Reference in New Issue
Block a user