diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2016-10-12 09:25:20 +0300 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2016-10-20 14:14:11 +0200 |
| commit | d1ca19cb3bc88318a54643f7a250ec6abab51108 (patch) | |
| tree | 68a2484b86301f19596a612ac1dec2a2ac2b49a5 /drivers/gpio | |
| parent | gpio: mxs: Unmap region obtained by of_iomap (diff) | |
| download | linux-dev-d1ca19cb3bc88318a54643f7a250ec6abab51108.tar.xz linux-dev-d1ca19cb3bc88318a54643f7a250ec6abab51108.zip | |
gpio: stmpe: || vs && typo
&& was obviously intended here.
Fixes: 6936e1f88d23 ('gpio: stmpe: Write int status register only when needed')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-stmpe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c index e7d422a6b90b..5b0042776ec7 100644 --- a/drivers/gpio/gpio-stmpe.c +++ b/drivers/gpio/gpio-stmpe.c @@ -409,7 +409,7 @@ static irqreturn_t stmpe_gpio_irq(int irq, void *dev) * 801/1801/1600, bits are cleared when read. * Edge detect register is not present on 801/1600/1801 */ - if (stmpe->partnum != STMPE801 || stmpe->partnum != STMPE1600 || + if (stmpe->partnum != STMPE801 && stmpe->partnum != STMPE1600 && stmpe->partnum != STMPE1801) { stmpe_reg_write(stmpe, statmsbreg + i, status[i]); stmpe_reg_write(stmpe, |