summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorAlexander Usyskin <alexander.usyskin@intel.com>2016-04-20 17:03:54 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-30 23:08:08 +0200
commit4a8eaa96d8eebf5818ddf1aca92e775a2c2d3f7e (patch)
tree7090c29614df8c2653d4d4df18434185ee1537a5 /drivers/misc
parentmei: amthif: discard not read messages (diff)
downloadlinux-4a8eaa96d8eebf5818ddf1aca92e775a2c2d3f7e.tar.xz
linux-4a8eaa96d8eebf5818ddf1aca92e775a2c2d3f7e.zip
mei: don't clean control queues on notify request timeout
Timeout on notify request is not a fatal condition, and actually cleaning control queues will disrupt other control flows of the same client. Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/mei/client.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index 09f5280fa021..85ae11d410cc 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -1337,12 +1337,8 @@ int mei_cl_notify_request(struct mei_cl *cl,
mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT));
mutex_lock(&dev->device_lock);
- if (cl->notify_en != request) {
- mei_io_list_flush(&dev->ctrl_rd_list, cl);
- mei_io_list_flush(&dev->ctrl_wr_list, cl);
- if (!cl->status)
- cl->status = -EFAULT;
- }
+ if (cl->notify_en != request && !cl->status)
+ cl->status = -EFAULT;
rets = cl->status;