| From 73ab4232388b7a08f17c8d08141ff2099fa0b161 Mon Sep 17 00:00:00 2001 |
| From: Alexander Usyskin <alexander.usyskin@intel.com> |
| Date: Tue, 12 Aug 2014 18:07:56 +0300 |
| Subject: mei: reset client state on queued connect request |
| |
| From: Alexander Usyskin <alexander.usyskin@intel.com> |
| |
| commit 73ab4232388b7a08f17c8d08141ff2099fa0b161 upstream. |
| |
| If connect request is queued (e.g. device in pg) set client state |
| to initializing, thus avoid preliminary exit in wait if current |
| state is disconnected. |
| |
| This is regression from: |
| |
| commit e4d8270e604c3202131bac607969605ac397b893 |
| Author: Alexander Usyskin <alexander.usyskin@intel.com> |
| mei: set connecting state just upon connection request is sent to the fw |
| |
| 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> |
| |
| --- |
| drivers/misc/mei/client.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/drivers/misc/mei/client.c |
| +++ b/drivers/misc/mei/client.c |
| @@ -512,6 +512,7 @@ int mei_cl_connect(struct mei_cl *cl, st |
| cl->timer_count = MEI_CONNECT_TIMEOUT; |
| list_add_tail(&cb->list, &dev->ctrl_rd_list.list); |
| } else { |
| + cl->state = MEI_FILE_INITIALIZING; |
| list_add_tail(&cb->list, &dev->ctrl_wr_list.list); |
| } |
| |