linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mei: fix an && vs || typo
@ 2018-01-06  9:26 Dan Carpenter
  2018-01-06 21:59 ` Winkler, Tomas
  0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2018-01-06  9:26 UTC (permalink / raw)
  To: Tomas Winkler
  Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, kernel-janitors

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

diff --git a/drivers/misc/mei/hw-txe.c b/drivers/misc/mei/hw-txe.c
index 84197277f26c..c2c8993e2a51 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);

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* RE: [PATCH] mei: fix an && vs || typo
  2018-01-06  9:26 [PATCH] mei: fix an && vs || typo Dan Carpenter
@ 2018-01-06 21:59 ` Winkler, Tomas
  0 siblings, 0 replies; 2+ messages in thread
From: Winkler, Tomas @ 2018-01-06 21:59 UTC (permalink / raw)
  To: Dan Carpenter, Colin Ian King
  Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, kernel-janitors


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


Thanks Dan but this was already reported and patch was created by Colin.
https://lkml.org/lkml/2017/12/19/696
I guess Greg has missed that one.
Thanks
Tomas

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-01-06 21:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-06  9:26 [PATCH] mei: fix an && vs || typo Dan Carpenter
2018-01-06 21:59 ` Winkler, Tomas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).