From patchwork Mon Jan 19 07:37:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 440 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Thu, 22 Jan 2009 00:53:25 +0000 Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1LPnoy-00070R-Vj for mchehab@infradead.org; Thu, 22 Jan 2009 00:53:25 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754515AbZAVAxY (ORCPT ); Wed, 21 Jan 2009 19:53:24 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754401AbZAVAxY (ORCPT ); Wed, 21 Jan 2009 19:53:24 -0500 Received: from mail.renesas.com ([202.234.163.13]:55194 "EHLO mail03.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754499AbZAVAxX (ORCPT ); Wed, 21 Jan 2009 19:53:23 -0500 X-AuditID: ac140386-0000000400001aa8-98-4977c37f52a0 Received: from guardian02.idc.renesas.com ([172.20.8.201]) by mail03.idc.renesas.com (sendmail) with ESMTP id n0M0rIUp000077; Thu, 22 Jan 2009 09:53:18 +0900 (JST) Received: (from root@localhost) by guardian02.idc.renesas.com with id n0M0rIeN016345; Thu, 22 Jan 2009 09:53:18 +0900 (JST) Received: from mta04.idc.renesas.com (localhost [127.0.0.1]) by mta04.idc.renesas.com with ESMTP id n0M0rHEf005627; Thu, 22 Jan 2009 09:53:17 +0900 (JST) Received: from PG10870.renesas.com ([172.30.8.159]) by ims05.idc.renesas.com (Sendmail) with ESMTPA id <0KDU008P5L4U34@ims05.idc.renesas.com>; Thu, 22 Jan 2009 09:53:18 +0900 (JST) Date: Mon, 19 Jan 2009 16:37:51 +0900 From: Kuninori Morimoto Subject: [PATCH] tw9910: bit mask operation fix on tw9910_mask_set. To: Guennadi Liakhovetski Cc: Linux Media Message-id: MIME-version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-type: text/plain; charset=US-ASCII User-Agent: SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.7 Emacs/22.1 (i386-mingw-nt5.1.2600) MULE/5.0 (SAKAKI) Meadow/3.00-dev (KIKU) X-Brightmail-Tracker: AAAAAA== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Signed-off-by: Kuninori Morimoto --- drivers/media/video/tw9910.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c index 52c0357..17d8205 100644 --- a/drivers/media/video/tw9910.c +++ b/drivers/media/video/tw9910.c @@ -460,9 +460,11 @@ static int tw9910_mask_set(struct i2c_client *client, u8 command, u8 mask, u8 set) { s32 val = i2c_smbus_read_byte_data(client, command); + if (val < 0) + return val; val &= ~mask; - val |= set; + val |= set & mask; return i2c_smbus_write_byte_data(client, command, val); }