| Message ID | 20141225000256.GB24302@vivalin-002 |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Dec 25, 2014 at 02:02:56AM +0200, Ahmed S. Darwish wrote: > From: Ahmed S. Darwish <ahmed.darwish@valeo.com> > > "Someone reported me that recent leaf firmwares go in trouble when > you send a command for a channel that does not exist. Instead ... > you can move the reset command to kvaser_usb_init_one() function." Please adapt the commit log message as follows: Recent Leaf firmware versions (>= 3.1.557) do not allow to send commands for non-existing channels. If a command is send for a non-existing channel, the firmware crashes. And you can add: Reported-by: Christopher Storah <Christopher.Storah@invetech.com.au> Signed-off-by: Olivier Sobrie <olivier@sobrie.be> Kr, Olivier > > Suggested-by: Olivier Sobrie <olivier@sobrie.be> > Signed-off-by: Ahmed S. Darwish <ahmed.darwish@valeo.com> > --- > 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 598e251..2791501 100644 > --- a/drivers/net/can/usb/kvaser_usb.c > +++ b/drivers/net/can/usb/kvaser_usb.c > @@ -1505,6 +1505,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"); > @@ -1609,9 +1613,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, -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/can/usb/kvaser_usb.c b/drivers/net/can/usb/kvaser_usb.c index 598e251..2791501 100644 --- a/drivers/net/can/usb/kvaser_usb.c +++ b/drivers/net/can/usb/kvaser_usb.c @@ -1505,6 +1505,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"); @@ -1609,9 +1613,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,