Commit 912ed8af authored by Colin Ian King's avatar Colin Ian King Committed by Greg Kroah-Hartman
Browse files

mei: fix incorrect logical operator in if statement



The current expression using the || operator is always true because
dev->dev_state cannot be equal to two different values at the same time.
Fix this by replacing the || with &&.

Detected by CoverityScan, CID#1463042 ("Constant expression result")

Fixes: 8d52af67 ("mei: speed up the power down flow")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cc365dcf
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1261,7 +1261,7 @@ irqreturn_t mei_me_irq_thread_handler(int irq, void *dev_id)
			break;

		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);