summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Usyskin <alexander.usyskin@intel.com>2014-07-17 10:53:35 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-17 18:38:36 -0700
commit22b987a325701223f9a37db700c6eb20b9924c6f (patch)
tree8c38a462a731ca9c0ca899da9949d7c4693cd39a
parent3e37ebb7183f0c4eb92a88c60657ac319c01b3e9 (diff)
downloadop-kernel-dev-22b987a325701223f9a37db700c6eb20b9924c6f.zip
op-kernel-dev-22b987a325701223f9a37db700c6eb20b9924c6f.tar.gz
mei: start disconnect request timer consistently
Link must be reset in case the fw doesn't respond to client disconnect request. We did charge the timer only in irq path from mei_cl_irq_close and not in mei_cl_disconnect Cc: stable@vger.kernel.org # 3.10+ 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>
-rw-r--r--drivers/misc/mei/client.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index 9f8ab28..6554500 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -491,6 +491,7 @@ int mei_cl_disconnect(struct mei_cl *cl)
cl_err(dev, cl, "failed to disconnect.\n");
goto free;
}
+ cl->timer_count = MEI_CONNECT_TIMEOUT;
mdelay(10); /* Wait for hardware disconnection ready */
list_add_tail(&cb->list, &dev->ctrl_rd_list.list);
} else {
OpenPOWER on IntegriCloud