linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tomas Winkler <tomas.winkler@intel.com>
To: stable@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org,
	Alexander Usyskin <alexander.usyskin@intel.com>
Subject: [char-msic 3/3] mei: fix return value on disconnection
Date: Tue, 29 Nov 2016 14:44:46 +0200	[thread overview]
Message-ID: <1480423486-32307-3-git-send-email-tomas.winkler@intel.com> (raw)
In-Reply-To: <1480423486-32307-1-git-send-email-tomas.winkler@intel.com>

commit 2d4d5481e2d6f93b25fcfb13a9f20bbfbf54266a upstream.

Correct errno on client disconnection is -ENODEV not -EBUSY

Cc: <stable@vger.kernel.org> #4.4
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/misc/mei/bus.c  | 2 +-
 drivers/misc/mei/main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index a77643954523..e59838231703 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -144,7 +144,7 @@ ssize_t __mei_cl_recv(struct mei_cl *cl, u8 *buf, size_t length)
 		mutex_lock(&bus->device_lock);
 
 		if (!mei_cl_is_connected(cl)) {
-			rets = -EBUSY;
+			rets = -ENODEV;
 			goto out;
 		}
 	}
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 80f9afcb1382..4ef189a7a2fb 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -207,7 +207,7 @@ static ssize_t mei_read(struct file *file, char __user *ubuf,
 
 		mutex_lock(&dev->device_lock);
 		if (!mei_cl_is_connected(cl)) {
-			rets = -EBUSY;
+			rets = -ENODEV;
 			goto out;
 		}
 	}
-- 
2.7.4

  parent reply	other threads:[~2016-11-29 11:49 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-29 12:44 [char-msic 1/3] mei: me: disable driver on SPT SPS firmware Tomas Winkler
2016-11-29 12:44 ` [char-msic 2/3] mei: me: fix place for kaby point device ids Tomas Winkler
2016-11-29 19:15   ` Greg Kroah-Hartman
2016-11-29 20:13     ` Winkler, Tomas
2016-11-29 20:24     ` Winkler, Tomas
2016-11-29 21:32       ` Greg Kroah-Hartman
2016-11-29 21:43         ` Winkler, Tomas
2016-11-29 12:44 ` Tomas Winkler [this message]
2016-11-29 19:15   ` [char-msic 3/3] mei: fix return value on disconnection Greg Kroah-Hartman
2016-11-29 20:15     ` Winkler, Tomas
2016-11-29 20:16     ` Winkler, Tomas
2016-11-29 19:14 ` [char-msic 1/3] mei: me: disable driver on SPT SPS firmware Greg Kroah-Hartman
2016-11-29 19:21   ` Winkler, Tomas
2016-11-29 21:31     ` Greg Kroah-Hartman
2016-11-29 21:41       ` Winkler, Tomas
2016-11-30  9:24         ` Greg Kroah-Hartman
2016-11-30  9:40           ` Winkler, Tomas

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=1480423486-32307-3-git-send-email-tomas.winkler@intel.com \
    --to=tomas.winkler@intel.com \
    --cc=alexander.usyskin@intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --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).