diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2013-01-08 16:07:23 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-08 19:40:46 -0500 |
commit | 6222f7bf8d7e2b16ffcc14bcb2c32ea069aac9fa (patch) | |
tree | 598fa39195c2081171e594cc42be93df0254b27c /drivers/misc | |
parent | 781d0d89224bbbc438c2c0360cfd4822bb35d280 (diff) |
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>
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/mei/amthif.c | 2 | ||||
-rw-r--r-- | drivers/misc/mei/init.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c index 88e6aa0f6b4e..7199e8369f1e 100644 --- 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) | |||
71 | unsigned char *msg_buf; | 71 | unsigned char *msg_buf; |
72 | int ret, i; | 72 | int ret, i; |
73 | 73 | ||
74 | dev->iamthif_state = MEI_IAMTHIF_IDLE; | ||
75 | |||
74 | mei_cl_init(cl, dev); | 76 | mei_cl_init(cl, dev); |
75 | 77 | ||
76 | i = mei_me_cl_by_uuid(dev, &mei_amthif_guid); | 78 | i = mei_me_cl_by_uuid(dev, &mei_amthif_guid); |
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c index 9e4011ef8508..70fad4ea474c 100644 --- 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) | |||
68 | init_waitqueue_head(&dev->wait_recvd_msg); | 68 | init_waitqueue_head(&dev->wait_recvd_msg); |
69 | init_waitqueue_head(&dev->wait_stop_wd); | 69 | init_waitqueue_head(&dev->wait_stop_wd); |
70 | dev->dev_state = MEI_DEV_INITIALIZING; | 70 | dev->dev_state = MEI_DEV_INITIALIZING; |
71 | dev->iamthif_state = MEI_IAMTHIF_IDLE; | ||
72 | 71 | ||
73 | mei_io_list_init(&dev->read_list); | 72 | mei_io_list_init(&dev->read_list); |
74 | mei_io_list_init(&dev->write_list); | 73 | mei_io_list_init(&dev->write_list); |