Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / staging / mei / init.c

diff --git a/drivers/staging/mei/init.c b/drivers/staging/mei/init.c
index 2818851..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);
        }
 
-       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"
@@ -205,10 +205,10 @@ int mei_hw_init(struct mei_device *dev)
                        "host_hw_state = 0x%08x, me_hw_state = 0x%08x.\n",
                        dev->host_hw_state, dev->me_hw_state);
 
-               if (!(dev->host_hw_state & H_RDY) != H_RDY)
+               if (!(dev->host_hw_state & H_RDY))
                        dev_dbg(&dev->pdev->dev, "host turn off H_RDY.\n");
 
-               if (!(dev->me_hw_state & ME_RDY_HRA) != ME_RDY_HRA)
+               if (!(dev->me_hw_state & ME_RDY_HRA))
                        dev_dbg(&dev->pdev->dev, "ME turn off ME_RDY.\n");
 
                printk(KERN_ERR "mei: link layer initialization failed.\n");