From patchwork Tue Jul 10 12:38:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martin X-Patchwork-Id: 13304 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SoZij-0000gj-Om for patchwork@linuxtv.org; Tue, 10 Jul 2012 14:39:13 +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.75/mailfrontend-2) with esmtp for id 1SoZij-0001l7-GV; Tue, 10 Jul 2012 14:39:13 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755458Ab2GJMjK (ORCPT ); Tue, 10 Jul 2012 08:39:10 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:39888 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753079Ab2GJMjJ (ORCPT ); Tue, 10 Jul 2012 08:39:09 -0400 Received: by wibhq12 with SMTP id hq12so3562383wib.1 for ; Tue, 10 Jul 2012 05:39:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=OSbHwTFzH4I6XJQfybYBmm/Lk1fKqfIBU2EgJji0z/M=; b=HhASOtuRNJKDiLWtkLUb01yKG1UvZ9M5VshjFRn7UBIV/11uQFnTzF/33RZaQ0H0nZ IDGgbwUYiMK8ueVdpaK8lWoIps9ZylPUBwiKYk5w5a7W2DPlTKCMArZYsdpqp3F5/V9z rBU1HHbcgXpl8D/m+WooE/xpG+VoRsCAcgXL7HOrBqEE283jc2kh8YgPfXLGHRtif8rR LjcRMd2FG/iAbttXYoFZ2Bl8WqNYtJ9vdFDoXsNtfWrfWDzDh4aMx87sQWjAa6KiJ1UZ 4Nk4vo3vyrzvwX7jyBuDOFH/zNUq+2DXmuotbidGS9wNmAu17yf7+/Pu7DOWiaQl3hij NTQQ== Received: by 10.216.134.12 with SMTP id r12mr1443704wei.164.1341923945056; Tue, 10 Jul 2012 05:39:05 -0700 (PDT) Received: from piscis.vsilicon.net (96.252.106.212.dynamic.jazztel.es. [212.106.252.96]) by mx.google.com with ESMTPS id n6sm42851376wie.7.2012.07.10.05.39.03 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 10 Jul 2012 05:39:04 -0700 (PDT) From: Javier Martin To: linux-media@vger.kernel.org Cc: fabio.estevam@freescale.com, laurent.pinchart@ideasonboard.com, g.liakhovetski@gmx.de, mchehab@infradead.org, Javier Martin Subject: [PATCH] media: mx2_camera: Don't modify non volatile parameters in try_fmt. Date: Tue, 10 Jul 2012 14:38:56 +0200 Message-Id: <1341923936-18503-1-git-send-email-javier.martin@vista-silicon.com> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQkpKu5B1EAlR5UcVSRCUs8gFJF7kQewnzi9viFEesadlaFooXRSX8ZrK8xM/yNSDVpSgV33 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.7.10.122414 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, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' --- drivers/media/video/mx2_camera.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index d5355de..4a96989 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/video/mx2_camera.c @@ -1370,6 +1370,7 @@ static int mx2_camera_try_fmt(struct soc_camera_device *icd, __u32 pixfmt = pix->pixelformat; struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct mx2_camera_dev *pcdev = ici->priv; + struct mx2_fmt_cfg *emma_prp; unsigned int width_limit; int ret; @@ -1432,7 +1433,7 @@ static int mx2_camera_try_fmt(struct soc_camera_device *icd, __func__, pcdev->s_width, pcdev->s_height); /* If the sensor does not support image size try PrP resizing */ - pcdev->emma_prp = mx27_emma_prp_get_format(xlate->code, + emma_prp = mx27_emma_prp_get_format(xlate->code, xlate->host_fmt->fourcc); memset(pcdev->resizing, 0, sizeof(pcdev->resizing));