stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org,
	Jimmy Assarsson <jimmyassarsson@gmail.com>,
	Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH 3.18 10/11] can: kvaser_usb: Correct return value in printout
Date: Tue, 31 Oct 2017 10:54:47 +0100	[thread overview]
Message-ID: <20171031095324.897224767@linuxfoundation.org> (raw)
In-Reply-To: <20171031095324.488947183@linuxfoundation.org>

3.18-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Jimmy Assarsson <jimmyassarsson@gmail.com>

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>

---
 drivers/net/can/usb/kvaser_usb.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/net/can/usb/kvaser_usb.c
+++ b/drivers/net/can/usb/kvaser_usb.c
@@ -1251,7 +1251,8 @@ static int kvaser_usb_close(struct net_d
 	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);

  parent reply	other threads:[~2017-10-31  9:54 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-31  9:54 [PATCH 3.18 00/11] 3.18.79-stable review Greg Kroah-Hartman
2017-10-31  9:54 ` [PATCH 3.18 01/11] ALSA: hda - fix headset mic problem for Dell machines with alc236 Greg Kroah-Hartman
2017-10-31 10:42   ` Takashi Iwai
2017-11-01 15:20     ` Greg Kroah-Hartman
2017-10-31  9:54 ` [PATCH 3.18 02/11] ceph: unlock dangling spinlock in try_flush_caps() Greg Kroah-Hartman
2017-10-31  9:54 ` [PATCH 3.18 03/11] usb: xhci: Handle error condition in xhci_stop_device() Greg Kroah-Hartman
2017-10-31  9:54 ` [PATCH 3.18 04/11] spi: uapi: spidev: add missing ioctl header Greg Kroah-Hartman
2017-10-31  9:54 ` [PATCH 3.18 05/11] fuse: fix READDIRPLUS skipping an entry Greg Kroah-Hartman
2017-10-31  9:54 ` [PATCH 3.18 06/11] Input: gtco - fix potential out-of-bound access Greg Kroah-Hartman
2017-10-31  9:54 ` [PATCH 3.18 07/11] assoc_array: Fix a buggy node-splitting case Greg Kroah-Hartman
2017-10-31  9:54 ` [PATCH 3.18 08/11] scsi: zfcp: fix erp_action use-before-initialize in REC action trace Greg Kroah-Hartman
2017-10-31  9:54 ` [PATCH 3.18 09/11] scsi: sg: Re-fix off by one in sg_fill_request_table() Greg Kroah-Hartman
2017-10-31  9:54 ` Greg Kroah-Hartman [this message]
2017-10-31  9:54 ` [PATCH 3.18 11/11] ecryptfs: fix dereference of NULL user_key_payload Greg Kroah-Hartman
2017-10-31 17:18 ` [PATCH 3.18 00/11] 3.18.79-stable review Guenter Roeck
2017-10-31 20:04 ` Shuah Khan
2017-11-01 15:20   ` Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171031095324.897224767@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=jimmyassarsson@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mkl@pengutronix.de \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).