From patchwork Mon Oct 19 14:07:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 7437341 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3A9D1BEEA4 for ; Mon, 19 Oct 2015 14:08:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6A0592067D for ; Mon, 19 Oct 2015 14:08:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 750DC20684 for ; Mon, 19 Oct 2015 14:08:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753005AbbJSOIB (ORCPT ); Mon, 19 Oct 2015 10:08:01 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:38098 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752969AbbJSOIA (ORCPT ); Mon, 19 Oct 2015 10:08:00 -0400 Received: by wicll6 with SMTP id ll6so7634742wic.1 for ; Mon, 19 Oct 2015 07:07:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=7wFeZuvW+fh2QZfjhTyTw0TcvEMYfCRNMLHNmmzt1Eg=; b=llvcRATCvDEVor3v3Iebcb/iYcw9IuaiOzWu3mCZB9Ee1MYxrLWpjHMDTL3sflyIFK XsxC3Ir9gk/TQ1WKbkY1P1oX1ScVi/CGYeaPiUaNpIS96IzFRhZdDB0oSuKzXUJHOV8E JuxzN8ytkgb4ocowvmeAd0/YxZco+Ngeb+5u81yj/mjcN7yqKlqlHgCAO2RA0l/8HKhq hkcuUgjZvyXrtzwXXznTzBnu+LClreNlBO2135lgBmRamjfyYAaKNF1G7nYrLuZ4HN0V qpEYe5P0jEBQH/o0omaR71B1FvS7chG3SByBgK9QUkqQDmcU6cEyC4xq8H0V7nO6Qe2h KjxQ== X-Received: by 10.180.86.231 with SMTP id s7mr20422812wiz.15.1445263679241; Mon, 19 Oct 2015 07:07:59 -0700 (PDT) Received: from groucho.site (ipbcc0ddf2.dynamic.kabel-deutschland.de. [188.192.221.242]) by smtp.gmail.com with ESMTPSA id q8sm3241169wiz.23.2015.10.19.07.07.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Oct 2015 07:07:58 -0700 (PDT) From: Ulrich Hecht To: linux-sh@vger.kernel.org Cc: magnus.damm@gmail.com, laurent.pinchart@ideasonboard.com, william.towle@codethink.co.uk, rob.taylor@codethink.co.uk, hans.verkuil@cisco.com, ian.molton@codethink.co.uk Subject: [PATCH/RFT 4/7] media: soc_camera: soc_scale_crop: Use correct pad number in try_fmt Date: Mon, 19 Oct 2015 16:07:37 +0200 Message-Id: <1445263660-6945-5-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1445263660-6945-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1445263660-6945-1-git-send-email-ulrich.hecht+renesas@gmail.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rob Taylor Fix calls to subdev try_fmt function to use valid pad numbers, fixing the case where subdevs (eg. ADV7612) have valid pad numbers that are non-zero. Signed-off-by: William Towle Reviewed-by: Rob Taylor Acked-by: Hans Verkuil --- drivers/media/platform/soc_camera/soc_scale_crop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/media/platform/soc_camera/soc_scale_crop.c b/drivers/media/platform/soc_camera/soc_scale_crop.c index bda29bc..2772215 100644 --- a/drivers/media/platform/soc_camera/soc_scale_crop.c +++ b/drivers/media/platform/soc_camera/soc_scale_crop.c @@ -225,6 +225,7 @@ static int client_set_fmt(struct soc_camera_device *icd, bool host_1to1; int ret; + format->pad = icd->src_pad_idx; ret = v4l2_device_call_until_err(sd->v4l2_dev, soc_camera_grp_id(icd), pad, set_fmt, NULL, format);