Commit 73ab4232 authored Aug 12, 2014 by Alexander Usyskin Committed by Greg Kroah-Hartman Aug 25, 2014

mei: reset client state on queued connect request



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 e4d8270e
Author: Alexander Usyskin <alexander.usyskin@intel.com>
mei: set connecting state just upon connection request is sent to the fw

CC: stable@vger.kernel.org # 3.15+
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>

parent 7d1311b9

drivers/misc/mei/client.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -601,6 +601,7 @@ int mei_cl_connect(struct mei_cl cl, struct file file)
	cl->timer_count = MEI_CONNECT_TIMEOUT;		cl->timer_count = MEI_CONNECT_TIMEOUT;
	list_add_tail(&cb->list, &dev->ctrl_rd_list.list);		list_add_tail(&cb->list, &dev->ctrl_rd_list.list);
	} else {		} else {
			cl->state = MEI_FILE_INITIALIZING;
	list_add_tail(&cb->list, &dev->ctrl_wr_list.list);		list_add_tail(&cb->list, &dev->ctrl_wr_list.list);
	}		}

Admin message