From 2c49b5bd61ccbe60b4e9759cce297ac437f1a415 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Tue, 8 Jan 2013 23:07:32 +0200 Subject: [PATCH] --- yaml --- r: 354930 b: refs/heads/master c: 627ca75733c84427992d798cfebb8e4fd2428917 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/misc/mei/init.c | 4 ++++ trunk/drivers/misc/mei/main.c | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ab339c97ca4d..a1cf1b0d57ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7e0c231aaa7a01df28634390381974cb76d3cb2 +refs/heads/master: 627ca75733c84427992d798cfebb8e4fd2428917 diff --git a/trunk/drivers/misc/mei/init.c b/trunk/drivers/misc/mei/init.c index 98a7fc18a90a..5d08db5b314e 100644 --- a/trunk/drivers/misc/mei/init.c +++ b/trunk/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/trunk/drivers/misc/mei/main.c b/trunk/drivers/misc/mei/main.c index f72bb77fc279..123c663509ef 100644 --- a/trunk/drivers/misc/mei/main.c +++ b/trunk/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");