diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2018-01-06 10:26:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-09 17:52:58 +0100 |
| commit | 16ae30ea17cdd2b67f486c3518592067c8f9cc62 (patch) | |
| tree | 6f59b0db1001b64598ea8a763f84f7f3764b6b24 /drivers/misc | |
| parent | android: binder: Prefer __func__ to using hardcoded function name (diff) | |
| download | linux-16ae30ea17cdd2b67f486c3518592067c8f9cc62.tar.xz linux-16ae30ea17cdd2b67f486c3518592067c8f9cc62.zip | |
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>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/hw-txe.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |