lkml.org 
[lkml]   [2021]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 091/133] usb: host: fotg210: fix the actual_length of an iso packet
    Date
    From: Kelly Devilliv <kelly.devilliv@gmail.com>

    [ Upstream commit 091cb2f782f32ab68c6f5f326d7868683d3d4875 ]

    We should acquire the actual_length of an iso packet
    from the iTD directly using FOTG210_ITD_LENGTH() macro.

    Signed-off-by: Kelly Devilliv <kelly.devilliv@gmail.com>
    Link: https://lore.kernel.org/r/20210627125747.127646-4-kelly.devilliv@gmail.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/host/fotg210-hcd.c | 5 ++---
    drivers/usb/host/fotg210.h | 5 -----
    2 files changed, 2 insertions(+), 8 deletions(-)

    diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c
    index 5dacc3076efd..e081392ec830 100644
    --- a/drivers/usb/host/fotg210-hcd.c
    +++ b/drivers/usb/host/fotg210-hcd.c
    @@ -4495,13 +4495,12 @@ static bool itd_complete(struct fotg210_hcd *fotg210, struct fotg210_itd *itd)

    /* HC need not update length with this error */
    if (!(t & FOTG210_ISOC_BABBLE)) {
    - desc->actual_length =
    - fotg210_itdlen(urb, desc, t);
    + desc->actual_length = FOTG210_ITD_LENGTH(t);
    urb->actual_length += desc->actual_length;
    }
    } else if (likely((t & FOTG210_ISOC_ACTIVE) == 0)) {
    desc->status = 0;
    - desc->actual_length = fotg210_itdlen(urb, desc, t);
    + desc->actual_length = FOTG210_ITD_LENGTH(t);
    urb->actual_length += desc->actual_length;
    } else {
    /* URB was too late */
    diff --git a/drivers/usb/host/fotg210.h b/drivers/usb/host/fotg210.h
    index b5cfa7aeb277..1a3f94123c88 100644
    --- a/drivers/usb/host/fotg210.h
    +++ b/drivers/usb/host/fotg210.h
    @@ -682,11 +682,6 @@ static inline unsigned fotg210_read_frame_index(struct fotg210_hcd *fotg210)
    return fotg210_readl(fotg210, &fotg210->regs->frame_index);
    }

    -#define fotg210_itdlen(urb, desc, t) ({ \
    - usb_pipein((urb)->pipe) ? \
    - (desc)->length - FOTG210_ITD_LENGTH(t) : \
    - FOTG210_ITD_LENGTH(t); \
    -})
    /*-------------------------------------------------------------------------*/

    #endif /* __LINUX_FOTG210_H */
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-09-20 18:54    [W:2.282 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site