From: David Sterba <dsterba@suse.cz>
Date: Tue, 28 Dec 2010 01:20:01 +0000 (-0800)
Subject: Input: bu21013_ts - fix misuse of logical operation in place of bitop
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=ef11e701f32fb0cd5c5f0f6fb9a9e28fab151219;p=linux-edison.git

Input: bu21013_ts - fix misuse of logical operation in place of bitop

Signed-off-by: David Sterba <dsterba@suse.cz>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c
index 2ca9e5d6646..f7fa9ef4cd6 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;