Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14c10c2a authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by Marc Kleine-Budde
Browse files

can: kvaser_usb: Retry the first bulk transfer on -ETIMEDOUT 



On some x86 laptops, plugging a Kvaser device again after an
unplug makes the firmware always ignore the very first command.
For such a case, provide some room for retries instead of
completely exiting the driver init code.

Signed-off-by: default avatarAhmed S. Darwish <ahmed.darwish@valeo.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 3803fa69

drivers/net/can/usb/kvaser_usb.c

+10 −2
Original line number Diff line number Diff line
@@ -1585,7 +1585,7 @@ static int kvaser_usb_probe(struct usb_interface *intf, 
{

	struct kvaser_usb *dev;

	int err = -ENOMEM;

	int i;

	int i, retry = 3;



	dev = devm_kzalloc(&intf->dev, sizeof(*dev), GFP_KERNEL);

	if (!dev)
@@ -1603,7 +1603,15 @@ static int kvaser_usb_probe(struct usb_interface *intf, 


	usb_set_intfdata(intf, dev);



	/* On some x86 laptops, plugging a Kvaser device again after

	 * an unplug makes the firmware always ignore the very first

	 * command. For such a case, provide some room for retries

	 * instead of completely exiting the driver.

	 */

	do {

		err = kvaser_usb_get_software_info(dev);

	} while (--retry && err == -ETIMEDOUT);



	if (err) {

		dev_err(&intf->dev,

			"Cannot get software infos, error %d\n", err);