From 2818e11d66fb0c3dfc57d8091a7dec03af4c463f Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Mon, 13 Jun 2011 16:39:31 +0300 Subject: [PATCH] --- yaml --- r: 254125 b: refs/heads/master c: a534bb6eea72c0d082dd2faab85450e5554ba1c8 h: refs/heads/master i: 254123: d0b220e74a3fb9df0539877f9a3d35f67a511955 v: v3 --- [refs] | 2 +- trunk/drivers/staging/mei/init.c | 2 +- trunk/drivers/staging/mei/wd.c | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3db2dd049fb1..6d98b6927d24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdf2df0e8ce634c9ee5f740a9303e8518ca78932 +refs/heads/master: a534bb6eea72c0d082dd2faab85450e5554ba1c8 diff --git a/trunk/drivers/staging/mei/init.c b/trunk/drivers/staging/mei/init.c index d1ffa32cd141..685fcf639644 100644 --- a/trunk/drivers/staging/mei/init.c +++ b/trunk/drivers/staging/mei/init.c @@ -189,7 +189,7 @@ int mei_hw_init(struct mei_device *dev) mutex_lock(&dev->device_lock); } - if (!err && !dev->recvd_msg) { + if (err <= 0 && !dev->recvd_msg) { dev->mei_state = MEI_DISABLED; dev_dbg(&dev->pdev->dev, "wait_event_interruptible_timeout failed" diff --git a/trunk/drivers/staging/mei/wd.c b/trunk/drivers/staging/mei/wd.c index 2564b038636a..fff53d0b5c6e 100644 --- a/trunk/drivers/staging/mei/wd.c +++ b/trunk/drivers/staging/mei/wd.c @@ -169,10 +169,15 @@ int mei_wd_stop(struct mei_device *dev, bool preserve) ret = wait_event_interruptible_timeout(dev->wait_stop_wd, dev->wd_stopped, 10 * HZ); mutex_lock(&dev->device_lock); - if (!dev->wd_stopped) - dev_dbg(&dev->pdev->dev, "stop wd failed to complete.\n"); - else - dev_dbg(&dev->pdev->dev, "stop wd complete.\n"); + if (dev->wd_stopped) { + dev_dbg(&dev->pdev->dev, "stop wd complete ret=%d.\n", ret); + ret = 0; + } else { + if (!ret) + ret = -ETIMEDOUT; + dev_warn(&dev->pdev->dev, + "stop wd failed to complete ret=%d.\n", ret); + } if (preserve) dev->wd_timeout = wd_timeout;