From patchwork Tue Jan 19 17:30:34 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: michael <michael@panicking.kicks-ass.org>
X-Patchwork-Id: 73908
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0JHUeQu024667
	for <patchwork-media@patchwork.kernel.org>;
	Tue, 19 Jan 2010 17:30:41 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753850Ab0ASRaj (ORCPT
	<rfc822;patchwork-media@patchwork.kernel.org>);
	Tue, 19 Jan 2010 12:30:39 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753847Ab0ASRai
	(ORCPT <rfc822;linux-media-outgoing>);
	Tue, 19 Jan 2010 12:30:38 -0500
Received: from ms01.sssup.it ([193.205.80.99]:38104 "EHLO sssup.it"
	rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP
	id S1753327Ab0ASRah (ORCPT <rfc822;linux-media@vger.kernel.org>);
	Tue, 19 Jan 2010 12:30:37 -0500
Received: from [193.205.82.7] (HELO gandalf.sssup.it)
	by sssup.it (CommuniGate Pro SMTP 4.1.8)
	with ESMTP-TLS id 57059442; Tue, 19 Jan 2010 18:28:15 +0100
Received: from [10.30.3.179] (vpn179.retis [10.30.3.179])
	by gandalf.sssup.it (8.12.10/8.12.10) with ESMTP id o0JHUYeI022535
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Tue, 19 Jan 2010 18:30:35 +0100
Message-ID: <4B55EC3A.3060308@panicking.kicks-ass.org>
Date: Tue, 19 Jan 2010 18:30:34 +0100
From: Michael Trimarchi <michael@panicking.kicks-ass.org>
User-Agent: Mozilla-Thunderbird 2.0.0.22 (X11/20090707)
MIME-Version: 1.0
To: "Aguirre, Sergio" <saaguirre@ti.com>
CC: "linux-media@vger.kernel.org" <linux-media@vger.kernel.org>
Subject: Re: omap34xxcam question?
References: <4B4F0762.4040007@panicking.kicks-ass.org>
	<A24693684029E5489D1D202277BE894451538FFB@dlee02.ent.ti.com>
	<4B4F537B.7000708@panicking.kicks-ass.org>
	<A24693684029E5489D1D202277BE894451539065@dlee02.ent.ti.com>
	<4B4F56C8.7060108@panicking.kicks-ass.org>
	<A24693684029E5489D1D202277BE894451539623@dlee02.ent.ti.com>
	<4B502982.4050508@panicking.kicks-ass.org>
In-Reply-To: <4B502982.4050508@panicking.kicks-ass.org>
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-media.vger.kernel.org>
X-Mailing-List: linux-media@vger.kernel.org


diff --git a/drivers/media/video/omap34xxcam.c b/drivers/media/video/omap34xxcam
index 53b587e..75bd858 100644
--- a/drivers/media/video/omap34xxcam.c
+++ b/drivers/media/video/omap34xxcam.c
@@ -448,6 +448,10 @@ static int try_pix_parm(struct omap34xxcam_videodev *vdev,
                        break;
                dev_dbg(&vdev->vfd->dev, "trying fmt %8.8x (%d)\n",
                        fmtd.pixelformat, fmtd_index);
+
+               if (fmtd.pixelformat != best_pix_in->pixelformat)
+                       continue;
+
                /*
                 * Get supported resolutions.
                 */
@@ -470,7 +474,7 @@ static int try_pix_parm(struct omap34xxcam_videodev *vdev,
                        pix_tmp_out = *wanted_pix_out;
                        rval = isp_try_fmt_cap(isp, &pix_tmp_in, &pix_tmp_out);
                        if (rval)
-                               return rval;
+                               continue;
 
                        dev_dbg(&vdev->vfd->dev, "this w %d\th %d\tfmt %8.8x\t"