mei: fix an && vs || typo

->dev_state can't be both MEI_DEV_RESETTING and MEI_DEV_POWER_DOWN at
the same time.  && was clearing intended here.

Fixes: 8d52af6795c0 ("mei: speed up the power down flow")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/mei/hw-txe.c b/drivers/misc/mei/hw-txe.c
index 84197277f26c5a51d8b1b05ec3ba6a59ed4f080f..c2c8993e2a511e64d18fb5da57bd5eb507e1d2e2 100644 (file)
--- a/drivers/misc/mei/hw-txe.c
+++ b/drivers/misc/mei/hw-txe.c
@@ -1128,7 +1128,7 @@ irqreturn_t mei_txe_irq_thread_handler(int irq, void *dev_id)
                /* Read from TXE */
                rets = mei_irq_read_handler(dev, &cmpl_list, &slots);
                if (rets &&
-                   (dev->dev_state != MEI_DEV_RESETTING ||
+                   (dev->dev_state != MEI_DEV_RESETTING &&
                     dev->dev_state != MEI_DEV_POWER_DOWN)) {
                        dev_err(dev->dev,
                                "mei_irq_read_handler ret = %d.\n", rets);