summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJimmy Assarsson <jimmyassarsson@gmail.com>2017-10-24 12:23:28 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2017-10-24 13:00:23 +0200
commit8f65a923e6b628e187d5e791cf49393dd5e8c2f9 (patch)
tree60ba76f015b4c8c3ff1aadefd9b23cc9cf1044af /drivers
parentcan: sun4i: fix loopback mode (diff)
downloadlinux-8f65a923e6b628e187d5e791cf49393dd5e8c2f9.tar.xz
linux-8f65a923e6b628e187d5e791cf49393dd5e8c2f9.zip
can: kvaser_usb: Correct return value in printout
If the return value from kvaser_usb_send_simple_msg() was non-zero, the return value from kvaser_usb_flush_queue() was printed in the kernel warning. Signed-off-by: Jimmy Assarsson <jimmyassarsson@gmail.com> Cc: linux-stable <stable@vger.kernel.org> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/can/usb/kvaser_usb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/can/usb/kvaser_usb.c b/drivers/net/can/usb/kvaser_usb.c
index 18cc529fb807..861e90efab86 100644
--- a/drivers/net/can/usb/kvaser_usb.c
+++ b/drivers/net/can/usb/kvaser_usb.c
@@ -1609,7 +1609,8 @@ static int kvaser_usb_close(struct net_device *netdev)
if (err)
netdev_warn(netdev, "Cannot flush queue, error %d\n", err);
- if (kvaser_usb_send_simple_msg(dev, CMD_RESET_CHIP, priv->channel))
+ err = kvaser_usb_send_simple_msg(dev, CMD_RESET_CHIP, priv->channel);
+ if (err)
netdev_warn(netdev, "Cannot reset card, error %d\n", err);
err = kvaser_usb_stop_chip(priv);