diff options
author | David S. Miller <davem@davemloft.net> | 2017-12-08 14:53:54 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-12-08 14:53:54 -0500 |
commit | fd29117aeb905aaacdf4ff5afbc7787fa50e16e4 (patch) | |
tree | e456596cd5c97715159c2cfbe9b5e8e53ce49ed2 /drivers/net/can/usb/esd_usb2.c | |
parent | 03afb6e43aaf71e761c1e22d36c2670ef82f089a (diff) | |
parent | 91785de6f94b58c3fb6664609e3682f011bd28d2 (diff) | |
download | linux-fd29117aeb905aaacdf4ff5afbc7787fa50e16e4.tar.bz2 |
Merge tag 'linux-can-fixes-for-4.15-20171208' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2017-12-08
this is a pull request of 6 patches for net/master.
Martin Kelly provides 5 patches for various USB based CAN drivers, that
properly cancel the URBs on adapter unplug, so that the driver doesn't
end up in an endless loop. Stephane Grosjean provides a patch to restart
the tx queue if zero length packages are transmitted.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/usb/esd_usb2.c')
-rw-r--r-- | drivers/net/can/usb/esd_usb2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c index 9fdb0f0bfa06..c6dcf93675c0 100644 --- a/drivers/net/can/usb/esd_usb2.c +++ b/drivers/net/can/usb/esd_usb2.c @@ -393,6 +393,8 @@ static void esd_usb2_read_bulk_callback(struct urb *urb) break; case -ENOENT: + case -EPIPE: + case -EPROTO: case -ESHUTDOWN: return; |