summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJimmy Assarsson <jimmyassarsson@gmail.com>2017-10-24 12:23:28 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-02 09:40:50 +0100
commitc1b0921021246a07e7b47f71f35fe89935fb385c (patch)
tree613053f8f627b06bd6c1c55b8ecb8cec80a24678
parent0c3cdb4536d150facef886fe2b82763b0ac36b03 (diff)
can: kvaser_usb: Correct return value in printout
commit 8f65a923e6b628e187d5e791cf49393dd5e8c2f9 upstream. 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> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 022bfa13ebfa..ddff13d1dc94 100644
--- a/drivers/net/can/usb/kvaser_usb.c
+++ b/drivers/net/can/usb/kvaser_usb.c
@@ -1607,7 +1607,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);