From patchwork Wed Jul 11 07:29:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martin X-Patchwork-Id: 1180731 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id F3ECF3FC5A for ; Wed, 11 Jul 2012 07:29:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754692Ab2GKH3s (ORCPT ); Wed, 11 Jul 2012 03:29:48 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:50856 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754158Ab2GKH3r (ORCPT ); Wed, 11 Jul 2012 03:29:47 -0400 Received: by wibhr14 with SMTP id hr14so809827wib.1 for ; Wed, 11 Jul 2012 00:29:46 -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=t9krX8VV3Ys+pnoFYGTbMLd3VXerSX2/SAeUYm0W25Q=; b=RgP4H/vRwB6wdvq2QmbKncbuL3p/Y3bOIx98GjK58QIiQz2nZavBrbkazRXK06F5xU kq0R5yP/yX2n3Zi+mJ2eH0jauAWhBISSllnjvDyRNGbt8i2tELgfaln3hho7ZPN8FSEs bdj7CHq74TJqRfLjZppzRXDmirDfLZFsDrAmmkNmD/tYRdo+TtZ8WcJ2PGbinb4HCYkQ VTZ3Ty9kVD1udPJDz9CSkHJYXDJD9aHG2yQzlkL9uBIdicYLmLBogRvsLCW2jQg3gcig QWQI4S+vhEgHzL1HDwLVWyjPmW9VfKLmzb3Q1QsQhqXdImE3BY63ufn+/wYiTiZBFy5S KdOg== Received: by 10.180.78.99 with SMTP id a3mr44628502wix.15.1341991786308; Wed, 11 Jul 2012 00:29:46 -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 ep14sm9633812wid.0.2012.07.11.00.29.44 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jul 2012 00:29:45 -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 v2] media: mx2_camera: Don't modify non volatile parameters in try_fmt. Date: Wed, 11 Jul 2012 09:29:36 +0200 Message-Id: <1341991776-11970-1-git-send-email-javier.martin@vista-silicon.com> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQnKBDD2ImXj0Z4ScP1bfL8bpAk6yhunyViZ0MKez0M53VejlJ03VIlJXe5stw6Izmm5wUkn Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org --- drivers/media/video/mx2_camera.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index d5355de..eda98fc 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,12 +1433,12 @@ 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)); if ((mf.width != pix->width || mf.height != pix->height) && - pcdev->emma_prp->cfg.in_fmt == PRP_CNTL_DATA_IN_YUV422) { + emma_prp->cfg.in_fmt == PRP_CNTL_DATA_IN_YUV422) { if (mx2_emmaprp_resize(pcdev, &mf, pix, false) < 0) dev_dbg(icd->parent, "%s: can't resize\n", __func__); }