lkml.org 
[lkml]   [2020]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 01/84] USB: dummy-hcd: use usb_urb_dir_in instead of usb_pipein
    Date
    From: Andrey Konovalov <andreyknvl@google.com>

    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>

    ---
    drivers/usb/gadget/udc/dummy_hcd.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/usb/gadget/udc/dummy_hcd.c
    +++ b/drivers/usb/gadget/udc/dummy_hcd.c
    @@ -1335,7 +1335,7 @@ static int dummy_perform_transfer(struct
    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) {
    @@ -1423,7 +1423,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 {
    @@ -1844,7 +1844,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) {
    @@ -2399,7 +2399,7 @@ static inline ssize_t show_urb(char *buf
    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: \

    \
     
     \ /
      Last update: 2020-01-11 11:14    [W:4.151 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site