diff options
Diffstat (limited to 'drivers/misc/mei/wd.c')
-rw-r--r-- | drivers/misc/mei/wd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c index 4fc2b3d4680a..636409f9667f 100644 --- a/drivers/misc/mei/wd.c +++ b/drivers/misc/mei/wd.c | |||
@@ -62,6 +62,7 @@ static void mei_wd_set_start_timeout(struct mei_device *dev, u16 timeout) | |||
62 | */ | 62 | */ |
63 | int mei_wd_host_init(struct mei_device *dev) | 63 | int mei_wd_host_init(struct mei_device *dev) |
64 | { | 64 | { |
65 | int id; | ||
65 | mei_cl_init(&dev->wd_cl, dev); | 66 | mei_cl_init(&dev->wd_cl, dev); |
66 | 67 | ||
67 | /* look for WD client and connect to it */ | 68 | /* look for WD client and connect to it */ |
@@ -69,12 +70,11 @@ int mei_wd_host_init(struct mei_device *dev) | |||
69 | dev->wd_timeout = MEI_WD_DEFAULT_TIMEOUT; | 70 | dev->wd_timeout = MEI_WD_DEFAULT_TIMEOUT; |
70 | dev->wd_state = MEI_WD_IDLE; | 71 | dev->wd_state = MEI_WD_IDLE; |
71 | 72 | ||
72 | /* find ME WD client */ | 73 | /* Connect WD ME client to the host client */ |
73 | mei_me_cl_update_filext(dev, &dev->wd_cl, | 74 | id = mei_me_cl_link(dev, &dev->wd_cl, |
74 | &mei_wd_guid, MEI_WD_HOST_CLIENT_ID); | 75 | &mei_wd_guid, MEI_WD_HOST_CLIENT_ID); |
75 | 76 | ||
76 | dev_dbg(&dev->pdev->dev, "wd: check client\n"); | 77 | if (id < 0) { |
77 | if (MEI_FILE_CONNECTING != dev->wd_cl.state) { | ||
78 | dev_info(&dev->pdev->dev, "wd: failed to find the client\n"); | 78 | dev_info(&dev->pdev->dev, "wd: failed to find the client\n"); |
79 | return -ENOENT; | 79 | return -ENOENT; |
80 | } | 80 | } |