From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754202Ab0L0PhB (ORCPT ); Mon, 27 Dec 2010 10:37:01 -0500 Received: from cantor2.suse.de ([195.135.220.15]:58965 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754134Ab0L0PhA (ORCPT ); Mon, 27 Dec 2010 10:37:00 -0500 From: David Sterba To: dmitry.torokhov@gmail.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, David Sterba , Linus Walleij , Naveen Kumar Gaddipati , Henrik Rydberg Subject: [PATCH] Input: bu21013_ts: fix misuse of logical operation in place of bitop Date: Mon, 27 Dec 2010 16:36:50 +0100 Message-Id: <1293464210-21649-1-git-send-email-dsterba@suse.cz> X-Mailer: git-send-email 1.7.3.4.578.g6068a Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CC: Linus Walleij CC: Naveen Kumar Gaddipati CC: Henrik Rydberg Signed-off-by: David Sterba --- 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