diff options
| author | David Sterba <dsterba@suse.cz> | 2010-12-27 17:20:01 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-27 17:23:10 -0800 |
| commit | ef11e701f32fb0cd5c5f0f6fb9a9e28fab151219 (patch) | |
| tree | a0c2ad9f64c955df4e57593f1546fd120ed2a6a7 | |
| parent | a06a09c802c869426cfe8c405c381c985c3b25b2 (diff) | |
| download | op-kernel-dev-ef11e701f32fb0cd5c5f0f6fb9a9e28fab151219.zip op-kernel-dev-ef11e701f32fb0cd5c5f0f6fb9a9e28fab151219.tar.gz | |
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>
| -rw-r--r-- | 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; |
