From patchwork Mon Dec 27 15:36:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 434301 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBRKCV9C025997 for ; Mon, 27 Dec 2010 20:16:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754193Ab0L0PhB (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 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id 7CD3879727; Mon, 27 Dec 2010 16:36:59 +0100 (CET) Received: by ds.suse.cz (Postfix, from userid 10065) id F40E874760; Mon, 27 Dec 2010 16:36:58 +0100 (CET) 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-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 27 Dec 2010 20:16:46 +0000 (UTC) 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;