projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a06a09c)
Input: bu21013_ts - fix misuse of logical operation in place of bitop
authorDavid Sterba <dsterba@suse.cz>
Tue, 28 Dec 2010 01:20:01 +0000 (17:20 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 28 Dec 2010 01:23:10 +0000 (17:23 -0800)
Signed-off-by: David Sterba <dsterba@suse.cz>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/touchscreen/bu21013_ts.c patch | blob | blame | history

diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c
index 2ca9e5d6646028c428ec06fd525ad971629d98a2..f7fa9ef4cd6579d5ee9c9ec47e5cf57e2034498d 100644 (file)
--- 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;