git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
drivers
/
staging
/
mei
/
init.c
diff --git
a/drivers/staging/mei/init.c
b/drivers/staging/mei/init.c
index
d1ffa32
..
685fcf6
100644
(file)
--- a/
drivers/staging/mei/init.c
+++ b/
drivers/staging/mei/init.c
@@
-189,7
+189,7
@@
int mei_hw_init(struct mei_device *dev)
mutex_lock(&dev->device_lock);
}
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"
dev->mei_state = MEI_DISABLED;
dev_dbg(&dev->pdev->dev,
"wait_event_interruptible_timeout failed"