diff options
| author | Ahmed S. Darwish <ahmed.darwish@valeo.com> | 2015-01-05 12:57:13 -0500 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-01-29 15:44:42 +0100 |
| commit | 014ff2c59685cb8045247dea39a10e93855d4293 (patch) | |
| tree | 59b42489e169bb0a168a0a11e12c59444a7e4dd8 | |
| parent | 3a74797d57cb89da1940a2bbb989d14fc40713e3 (diff) | |
| download | lwn-014ff2c59685cb8045247dea39a10e93855d4293.tar.gz lwn-014ff2c59685cb8045247dea39a10e93855d4293.zip | |
can: kvaser_usb: Don't send a RESET_CHIP for non-existing channels
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>
| -rw-r--r-- | drivers/net/can/usb/kvaser_usb.c | 7 |
1 files 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, |