lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 036/862] can: kvaser_usb_leaf: Fix CAN state after restart
    Date
    From: Anssi Hannula <anssi.hannula@bitwise.fi>

    commit 0be1a655fe68c8e6dcadbcbddb69cf2fb29881f5 upstream.

    can_restart() expects CMD_START_CHIP to set the error state to
    ERROR_ACTIVE as it calls netif_carrier_on() immediately afterwards.

    Otherwise the user may immediately trigger restart again and hit a
    BUG_ON() in can_restart().

    Fix kvaser_usb_leaf set_mode(CMD_START_CHIP) to set the expected state.

    Cc: stable@vger.kernel.org
    Fixes: 080f40a6fa28 ("can: kvaser_usb: Add support for Kvaser CAN/USB devices")
    Tested-by: Jimmy Assarsson <extja@kvaser.com>
    Signed-off-by: Anssi Hannula <anssi.hannula@bitwise.fi>
    Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
    Link: https://lore.kernel.org/all/20221010150829.199676-5-extja@kvaser.com
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
    +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
    @@ -1431,6 +1431,8 @@ static int kvaser_usb_leaf_set_mode(stru
    err = kvaser_usb_leaf_simple_cmd_async(priv, CMD_START_CHIP);
    if (err)
    return err;
    +
    + priv->can.state = CAN_STATE_ERROR_ACTIVE;
    break;
    default:
    return -EOPNOTSUPP;

    \
     
     \ /
      Last update: 2022-10-19 10:47    [W:4.151 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site