mei: move MEI_IAMTHIF_IDLE to amthif host init function

Since the amthif state is not examined until amthif is connected we can safely move it to the amthif host init function Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
git-mirror · Jan 9, 2013 · 6222f7b · 6222f7b
1 parent 781d0d8
commit 6222f7b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
@@ -71,6 +71,8 @@ int mei_amthif_host_init(struct mei_device *dev)
 	unsigned char *msg_buf;
 	int ret, i;
 
+	dev->iamthif_state = MEI_IAMTHIF_IDLE;
+
 	mei_cl_init(cl, dev);
 
 	i = mei_me_cl_by_uuid(dev, &mei_amthif_guid);

diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
@@ -68,7 +68,6 @@ struct mei_device *mei_device_init(struct pci_dev *pdev)
 	init_waitqueue_head(&dev->wait_recvd_msg);
 	init_waitqueue_head(&dev->wait_stop_wd);
 	dev->dev_state = MEI_DEV_INITIALIZING;
-	dev->iamthif_state = MEI_IAMTHIF_IDLE;
 
 	mei_io_list_init(&dev->read_list);
 	mei_io_list_init(&dev->write_list);