lkml.org 
[lkml]   [2015]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 118/176] can: kvaser_usb: Don't send a RESET_CHIP for non-existing channels
    Date
    From: "Ahmed S. Darwish" <ahmed.darwish@valeo.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 5e7e6e0c9b47a45576c38b4a72d67927a5e049f7 upstream.

    Recent Leaf firmware versions (>= 3.1.557) do not allow to send
    commands for non-existing channels. If a command is sent for a
    non-existing channel, the firmware crashes.

    Reported-by: Christopher Storah <Christopher.Storah@invetech.com.au>
    Signed-off-by: Olivier Sobrie <olivier@sobrie.be>
    Signed-off-by: Ahmed S. Darwish <ahmed.darwish@valeo.com>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/net/can/usb/kvaser_usb.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/can/usb/kvaser_usb.c b/drivers/net/can/usb/kvaser_usb.c
    index 925273ca7879..63fb90b006ba 100644
    --- a/drivers/net/can/usb/kvaser_usb.c
    +++ b/drivers/net/can/usb/kvaser_usb.c
    @@ -1494,6 +1494,10 @@ static int kvaser_usb_init_one(struct usb_interface *intf,
    struct kvaser_usb_net_priv *priv;
    int i, err;

    + err = kvaser_usb_send_simple_msg(dev, CMD_RESET_CHIP, channel);
    + if (err)
    + return err;
    +
    netdev = alloc_candev(sizeof(*priv), MAX_TX_URBS);
    if (!netdev) {
    dev_err(&intf->dev, "Cannot alloc candev\n");
    @@ -1597,9 +1601,6 @@ static int kvaser_usb_probe(struct usb_interface *intf,

    usb_set_intfdata(intf, dev);

    - for (i = 0; i < MAX_NET_DEVICES; i++)
    - kvaser_usb_send_simple_msg(dev, CMD_RESET_CHIP, i);
    -
    err = kvaser_usb_get_software_info(dev);
    if (err) {
    dev_err(&intf->dev,
    --
    2.2.2


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