lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Ahmed S. Darwish <ahmed.darwish@valeo.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Ahmed S. Darwish
2015-01-26 07:24:06 +02:00
committed by Marc Kleine-Budde
parent 3803fa6977
commit 14c10c2a1d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/can/usb/kvaser_usb.c
View File

@@ -1585,7 +1585,7 @@ static int kvaser_usb_probe(struct usb_interface *intf,
{ {
struct kvaser_usb *dev; struct kvaser_usb *dev;
int err = -ENOMEM; int err = -ENOMEM;
int i; int i, retry = 3;
dev = devm_kzalloc(&intf->dev, sizeof(*dev), GFP_KERNEL); dev = devm_kzalloc(&intf->dev, sizeof(*dev), GFP_KERNEL);
if (!dev) if (!dev)
@@ -1603,7 +1603,15 @@ static int kvaser_usb_probe(struct usb_interface *intf,
usb_set_intfdata(intf, dev); usb_set_intfdata(intf, dev);
err = kvaser_usb_get_software_info(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) { if (err) {
dev_err(&intf->dev, dev_err(&intf->dev,
"Cannot get software infos, error %d\n", err); "Cannot get software infos, error %d\n", err);