From: Dan Carpenter Date: Sat, 6 Jan 2018 09:26:50 +0000 (+0300) Subject: mei: fix an && vs || typo X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=16ae30ea17cdd2b67f486c3518592067c8f9cc62;p=linux.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/misc/mei/hw-txe.c b/drivers/misc/mei/hw-txe.c index 84197277f26c5..c2c8993e2a511 100644 --- 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);