[PATCH] Input: bu21013_ts: fix misuse of logical operation in place of bitop

[David Sterba]

CC: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
CC: Naveen Kumar Gaddipati <naveen.gaddipati@xxxxxxxxxxxxxx>
CC: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Signed-off-by: David Sterba <dsterba@xxxxxxx>
---
 drivers/input/touchscreen/bu21013_ts.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c
index 2ca9e5d..f7fa9ef 100644
--- a/drivers/input/touchscreen/bu21013_ts.c
+++ b/drivers/input/touchscreen/bu21013_ts.c
@@ -365,7 +365,7 @@ static int bu21013_init_chip(struct bu21013_ts_data *data)
 	}
 
 	retval = i2c_smbus_write_byte_data(i2c, BU21013_TH_OFF_REG,
-				BU21013_TH_OFF_4 || BU21013_TH_OFF_3);
+				BU21013_TH_OFF_4 | BU21013_TH_OFF_3);
 	if (retval < 0) {
 		dev_err(&i2c->dev, "BU21013_TH_OFF reg write failed\n");
 		return retval;
-- 
1.7.3.4.578.g6068a

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/