USB: dummy-hcd: use usb_urb_dir_in instead of usb_pipein

commit 6dabeb891c001c592645df2f477fed9f5d959987 upstream.

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>
Link: https://lore.kernel.org/r/4ae9e68ebca02f08a93ac61fe065057c9a01f0a8.1571667489.git.andreyknvl@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c
index 7e90f786d923e7e302fa65d97e76485c3ad576b8..8218a5845ed0b8bf044f65a2310513c81f9c85a9 100644 (file)
--- a/drivers/usb/gadget/udc/dummy_hcd.c
+++ b/drivers/usb/gadget/udc/dummy_hcd.c
@@ -1325,7 +1325,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) {
@@ -1413,7 +1413,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 {
@@ -1837,7 +1837,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) {
@@ -2390,7 +2390,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: \