36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Usyskin <alexander.usyskin@intel.com>
|
|
Date: Thu, 6 Sep 2018 09:09:43 +0300
|
|
Subject: [PATCH] mei: expedite ioctl return on the notify set operation error
|
|
|
|
The notify set operation ioctl will wait till timeout is expired
|
|
even in case when the FW returned an error.
|
|
Check the status field of the client object in wait_event_timeout()
|
|
to determine if the caller can return earlier.
|
|
|
|
Change-Id: I2e5fd5a99d354ab98ca0fd53aa8b5c15e848739c
|
|
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
|
|
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
|
|
---
|
|
drivers/misc/mei/client.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
|
|
index 2774737c1031..63183e361d7f 100644
|
|
--- a/drivers/misc/mei/client.c
|
|
+++ b/drivers/misc/mei/client.c
|
|
@@ -1359,7 +1359,9 @@ int mei_cl_notify_request(struct mei_cl *cl,
|
|
|
|
mutex_unlock(&dev->device_lock);
|
|
wait_event_timeout(cl->wait,
|
|
- cl->notify_en == request || !mei_cl_is_connected(cl),
|
|
+ cl->notify_en == request ||
|
|
+ cl->status ||
|
|
+ !mei_cl_is_connected(cl),
|
|
mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT));
|
|
mutex_lock(&dev->device_lock);
|
|
|
|
--
|
|
https://clearlinux.org
|
|
|