From patchwork Wed May 20 16:39:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Towle X-Patchwork-Id: 29751 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1YvMNv-0002jM-NP; Thu, 21 May 2015 11:03:23 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.76/mailfrontend-8) with esmtp id 1YvMNt-0006O3-ln; Thu, 21 May 2015 11:03:23 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932177AbbEUJDQ (ORCPT + 1 other); Thu, 21 May 2015 05:03:16 -0400 Received: from 82-70-136-246.dsl.in-addr.zen.co.uk ([82.70.136.246]:56565 "EHLO xk120.dyn.ducie.codethink.co.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932170AbbEUJDN (ORCPT ); Thu, 21 May 2015 05:03:13 -0400 Received: from william by xk120.dyn.ducie.codethink.co.uk with local (Exim 4.80) (envelope-from ) id 1Yv72I-0004Cx-EL; Wed, 20 May 2015 17:40:02 +0100 From: William Towle To: linux-kernel@lists.codethink.co.uk, linux-media@vger.kernel.org Cc: g.liakhovetski@gmx.de, sergei.shtylyov@cogentembedded.com, hverkuil@xs4all.nl, rob.taylor@codethink.co.uk Subject: [PATCH 16/20] media: adv7180: Fix set_pad_format() passing wrong format Date: Wed, 20 May 2015 17:39:36 +0100 Message-Id: <1432139980-12619-17-git-send-email-william.towle@codethink.co.uk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1432139980-12619-1-git-send-email-william.towle@codethink.co.uk> References: <1432139980-12619-1-git-send-email-william.towle@codethink.co.uk> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2015.5.21.85416 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1100_1199 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Return a usable format (and resolution) from adv7180_set_pad_format() in the TRY_FORMAT case Signed-off-by: Rob Taylor Tested-by: William Towle --- drivers/media/i2c/adv7180.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c index 09a96df..ba0b92d5 100644 --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c @@ -686,12 +686,14 @@ static int adv7180_set_pad_format(struct v4l2_subdev *sd, adv7180_set_field_mode(state); adv7180_set_power(state, true); } + adv7180_mbus_fmt(sd, framefmt); } else { framefmt = v4l2_subdev_get_try_format(sd, cfg, 0); *framefmt = format->format; + adv7180_mbus_fmt(sd, framefmt); + format->format = *framefmt; } - - return adv7180_mbus_fmt(sd, framefmt); + return 0; } static int adv7180_g_mbus_config(struct v4l2_subdev *sd,