Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761181AbYGKUwy (ORCPT ); Fri, 11 Jul 2008 16:52:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751852AbYGKUwq (ORCPT ); Fri, 11 Jul 2008 16:52:46 -0400 Received: from mail.queued.net ([207.210.101.209]:1528 "EHLO mail.queued.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751109AbYGKUwp (ORCPT ); Fri, 11 Jul 2008 16:52:45 -0400 Date: Fri, 11 Jul 2008 16:52:16 -0400 From: Andres Salomon To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, Cortland Setlow , corbet@lwn.net, video4linux-list@redhat.com, Mauro Carvalho Chehab Subject: [PATCH resend] ov7670: clean up ov7670_read semantics Message-ID: <20080711165216.4dc32c4c@fred> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.12.10; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1604 Lines: 51 [note: this should probably go in for 2.6.26, as it fixes a bug in ov7670_s_fmt where we incorrectly think that we've failed because we return !0] Cortland Setlow pointed out a bug in ov7670.c where the result from ov7670_read() was just being checked for !0, rather than <0. This made me realize that ov7670_read's semantics were rather confusing; it both fills in 'value' with the result, and returns it. This is goes against general kernel convention; so rather than fixing callers, let's fix the function. This makes ov7670_read return <0 in the case of an error, and 0 upon success. Thus, code like: res = ov7670_read(...); if (!res) goto error; ..will work properly. Signed-off-by: Cortland Setlow Signed-off-by: Andres Salomon Acked-by: Jonathan Corbet --- drivers/media/video/ov7670.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c index 2bc6bdc..d7bfd30 100644 --- a/drivers/media/video/ov7670.c +++ b/drivers/media/video/ov7670.c @@ -406,8 +406,10 @@ static int ov7670_read(struct i2c_client *c, unsigned char reg, int ret; ret = i2c_smbus_read_byte_data(c, reg); - if (ret >= 0) + if (ret >= 0) { *value = (unsigned char) ret; + ret = 0; + } return ret; } -- 1.5.5.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/