diff options
| author | Alexander Usyskin <alexander.usyskin@intel.com> | 2014-07-17 10:53:35 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-05 16:28:34 -0700 |
| commit | 2cffa7238a408b7ff5ce9a4352485ff035fb7b19 (patch) | |
| tree | 5eca554a11cc53e35505ac45c0b69423ea42ebc4 /drivers/misc | |
| parent | 8666dec8958fc91913fe398178d26f33c1ea5745 (diff) | |
| download | linux-3.10-2cffa7238a408b7ff5ce9a4352485ff035fb7b19.tar.gz linux-3.10-2cffa7238a408b7ff5ce9a4352485ff035fb7b19.tar.bz2 linux-3.10-2cffa7238a408b7ff5ce9a4352485ff035fb7b19.zip | |
mei: start disconnect request timer consistently
commit 22b987a325701223f9a37db700c6eb20b9924c6f upstream.
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
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c index 0bb2aa2c6fb..da2385bb353 100644 --- a/drivers/misc/mei/client.c +++ b/drivers/misc/mei/client.c @@ -405,6 +405,7 @@ int mei_cl_disconnect(struct mei_cl *cl) dev_err(&dev->pdev->dev, "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 { |