[char-misc-next 18/27] mei: wake blocked write on link reset

From	Tomas Winkler <tomas.winkler@intel.com>
Newsgroups	linux.kernel
Subject	[char-misc-next 18/27] mei: wake blocked write on link reset
Date	2016-02-07 22:40 +0100
Message-ID	<qZFdL-3BZ-7@gated-at.bofh.it> (permalink)
References	<qZFdL-3BZ-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Alexander Usyskin <alexander.usyskin@intel.com>

In case of link reset all blocked writes should be interrupted.
Note, that currently blocking write is used only through bus layer.

Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 drivers/misc/mei/client.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index 3fd070a698ce..5ddc690752c2 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -1691,7 +1691,8 @@ out:
 
 		mutex_unlock(&dev->device_lock);
 		rets = wait_event_interruptible(cl->tx_wait,
-				cl->writing_state == MEI_WRITE_COMPLETE);
+				cl->writing_state == MEI_WRITE_COMPLETE ||
+				(!mei_cl_is_connected(cl)));
 		mutex_lock(&dev->device_lock);
 		/* wait_event_interruptible returns -ERESTARTSYS */
 		if (rets) {
@@ -1699,6 +1700,10 @@ out:
 				rets = -EINTR;
 			goto err;
 		}
+		if (cl->writing_state != MEI_WRITE_COMPLETE) {
+			rets = -EFAULT;
+			goto err;
+		}
 	}
 
 	rets = size;
-- 
2.4.3

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[char-misc-next 18/27] mei: wake blocked write on link reset Tomas Winkler <tomas.winkler@intel.com> - 2016-02-07 22:40 +0100

csiph-web