lkml.org 
[lkml]   [2021]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 35/95] can: peak_usb: pcan_usb_fd_decode_status(): fix back to ERROR_ACTIVE state notification
    Date
    From: Stephane Grosjean <s.grosjean@peak-system.com>

    commit 3d031abc7e7249573148871180c28ecedb5e27df upstream.

    This corrects the lack of notification of a return to ERROR_ACTIVE
    state for USB - CANFD devices from PEAK-System.

    Fixes: 0a25e1f4f185 ("can: peak_usb: add support for PEAK new CANFD USB adapters")
    Link: https://lore.kernel.org/all/20210929142111.55757-1-s.grosjean@peak-system.com
    Cc: stable@vger.kernel.org
    Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    --- a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
    +++ b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
    @@ -551,11 +551,10 @@ static int pcan_usb_fd_decode_status(str
    } else if (sm->channel_p_w_b & PUCAN_BUS_WARNING) {
    new_state = CAN_STATE_ERROR_WARNING;
    } else {
    - /* no error bit (so, no error skb, back to active state) */
    - dev->can.state = CAN_STATE_ERROR_ACTIVE;
    + /* back to (or still in) ERROR_ACTIVE state */
    + new_state = CAN_STATE_ERROR_ACTIVE;
    pdev->bec.txerr = 0;
    pdev->bec.rxerr = 0;
    - return 0;
    }

    /* state hasn't changed */

    \
     
     \ /
      Last update: 2021-10-25 21:40    [W:3.411 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site