From: Alexander Usyskin <alexander.usyskin@intel.com>
Date: Wed, 20 Apr 2016 15:03:54 +0000 (-0400)
Subject: mei: don't clean control queues on notify request timeout
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4a8eaa96d8eebf5818ddf1aca92e775a2c2d3f7e;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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;