mei: move work initialization to mei_device_init

Let mei_device_init initialize all the software constructs.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 4 insertions, 2 deletions

diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 98a7fc18a90a..5d08db5b314e 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -76,6 +76,10 @@ struct mei_device *mei_device_init(struct pci_dev *pdev)
         mei_io_list_init(&dev->ctrl_rd_list);
         mei_io_list_init(&dev->amthif_cmd_list);
         mei_io_list_init(&dev->amthif_rd_complete_list);
+
+        INIT_DELAYED_WORK(&dev->timer_work, mei_timer);
+        INIT_WORK(&dev->init_work, mei_host_client_init);
+
         dev->pdev = pdev;
         return dev;
 }
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index f72bb77fc279..123c663509ef 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -889,8 +889,6 @@ static int mei_probe(struct pci_dev *pdev,
                        pdev->irq);
                 goto disable_msi;
         }
-        INIT_DELAYED_WORK(&dev->timer_work, mei_timer);
-        INIT_WORK(&dev->init_work, mei_host_client_init);
 
         if (mei_hw_init(dev)) {
                 dev_err(&pdev->dev, "init hw failure.\n");