From 10f8c98d2507875ca7f5284979da99de61872fb2 Mon Sep 17 00:00:00 2001 From: Oren Weil Date: Wed, 7 Sep 2011 09:03:15 +0300 Subject: [PATCH] --- yaml --- r: 268310 b: refs/heads/master c: 2ad64ba8ea55319ddc3c7534e77a4abee5d6fa43 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/mei/wd.c | 37 ++++++++++++++-------------------- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/[refs] b/[refs] index af8c856a01f3..005cc231bffb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d70e935596a51742ecc899b3d9629f11e506522 +refs/heads/master: 2ad64ba8ea55319ddc3c7534e77a4abee5d6fa43 diff --git a/trunk/drivers/staging/mei/wd.c b/trunk/drivers/staging/mei/wd.c index 68c177be7e40..fd679524f383 100644 --- a/trunk/drivers/staging/mei/wd.c +++ b/trunk/drivers/staging/mei/wd.c @@ -72,32 +72,25 @@ bool mei_wd_host_init(struct mei_device *dev) /* look for WD client and connect to it */ dev->wd_cl.state = MEI_FILE_DISCONNECTED; - dev->wd_timeout = watchdog_timeout; - - if (dev->wd_timeout > 0) { - /* find ME WD client */ - mei_find_me_client_update_filext(dev, &dev->wd_cl, - &mei_wd_guid, MEI_WD_HOST_CLIENT_ID); - - dev_dbg(&dev->pdev->dev, "check wd_cl\n"); - if (MEI_FILE_CONNECTING == dev->wd_cl.state) { - if (!mei_connect(dev, &dev->wd_cl)) { - dev_dbg(&dev->pdev->dev, "Failed to connect to WD client\n"); - dev->wd_cl.state = MEI_FILE_DISCONNECTED; - dev->wd_cl.host_client_id = 0; - ret = false; - goto end; - } else { - dev->wd_cl.timer_count = CONNECT_TIMEOUT; - } - } else { - dev_dbg(&dev->pdev->dev, "Failed to find WD client\n"); + dev->wd_timeout = AMT_WD_DEFAULT_TIMEOUT; + + /* find ME WD client */ + mei_find_me_client_update_filext(dev, &dev->wd_cl, + &mei_wd_guid, MEI_WD_HOST_CLIENT_ID); + + dev_dbg(&dev->pdev->dev, "check wd_cl\n"); + if (MEI_FILE_CONNECTING == dev->wd_cl.state) { + if (!mei_connect(dev, &dev->wd_cl)) { + dev_dbg(&dev->pdev->dev, "Failed to connect to WD client\n"); + dev->wd_cl.state = MEI_FILE_DISCONNECTED; + dev->wd_cl.host_client_id = 0; ret = false; goto end; + } else { + dev->wd_cl.timer_count = CONNECT_TIMEOUT; } } else { - dev->wd_bypass = true; - dev_dbg(&dev->pdev->dev, "WD requested to be disabled\n"); + dev_dbg(&dev->pdev->dev, "Failed to find WD client\n"); ret = false; goto end; }