summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2010-12-27 17:20:01 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-12-27 17:23:10 -0800
commitef11e701f32fb0cd5c5f0f6fb9a9e28fab151219 (patch)
treea0c2ad9f64c955df4e57593f1546fd120ed2a6a7 /drivers/input/touchscreen
parenta06a09c802c869426cfe8c405c381c985c3b25b2 (diff)
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>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r--drivers/input/touchscreen/bu21013_ts.c2
1 files changed, 1 insertions, 1 deletions
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;