diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 07:35:09 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 07:35:09 -0700 |
| commit | 0c9e98af5e94877ad3b1af2c0f39b2376a462ded (patch) | |
| tree | acbab68f802fadbff85590c139c87dc199bb465d /drivers/staging/mei | |
| parent | af0c25c4876305dfa1a25ac1cc92d3cddfa476a6 (diff) | |
| parent | fe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff) | |
Merge Linux 3.0-rc6 into staging-next
This handles the merge conflicts with the
drivers/staging/brcm80211/Kconfig file due to changes on the two
different branches.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/mei')
| -rw-r--r-- | drivers/staging/mei/init.c | 2 | ||||
| -rw-r--r-- | drivers/staging/mei/wd.c | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/drivers/staging/mei/init.c b/drivers/staging/mei/init.c index eb70e70a274..0fa8216fd0e 100644 --- a/drivers/staging/mei/init.c +++ b/drivers/staging/mei/init.c @@ -185,7 +185,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/drivers/staging/mei/wd.c b/drivers/staging/mei/wd.c index 18516a8670f..42f04efc90e 100644 --- a/drivers/staging/mei/wd.c +++ b/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; |