Commit 16ae30ea authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman

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: 8d52af67 ("mei: speed up the power down flow")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 00c41cdd
...@@ -1128,7 +1128,7 @@ irqreturn_t mei_txe_irq_thread_handler(int irq, void *dev_id) ...@@ -1128,7 +1128,7 @@ irqreturn_t mei_txe_irq_thread_handler(int irq, void *dev_id)
/* Read from TXE */ /* Read from TXE */
rets = mei_irq_read_handler(dev, &cmpl_list, &slots); rets = mei_irq_read_handler(dev, &cmpl_list, &slots);
if (rets && if (rets &&
(dev->dev_state != MEI_DEV_RESETTING || (dev->dev_state != MEI_DEV_RESETTING &&
dev->dev_state != MEI_DEV_POWER_DOWN)) { dev->dev_state != MEI_DEV_POWER_DOWN)) {
dev_err(dev->dev, dev_err(dev->dev,
"mei_irq_read_handler ret = %d.\n", rets); "mei_irq_read_handler ret = %d.\n", rets);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment