From patchwork Mon Sep 18 23:08:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Harvey X-Patchwork-Id: 9957741 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CF19C60208 for ; Mon, 18 Sep 2017 23:05:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B82E228C69 for ; Mon, 18 Sep 2017 23:05:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA4C528DB8; Mon, 18 Sep 2017 23:05:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E96728C69 for ; Mon, 18 Sep 2017 23:05:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750828AbdIRXFT (ORCPT ); Mon, 18 Sep 2017 19:05:19 -0400 Received: from mail-pf0-f180.google.com ([209.85.192.180]:49539 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750714AbdIRXFS (ORCPT ); Mon, 18 Sep 2017 19:05:18 -0400 Received: by mail-pf0-f180.google.com with SMTP id l188so1000401pfc.6 for ; Mon, 18 Sep 2017 16:05:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gateworks-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=ACEC0mxq0jURSzQ3qQmf4WSNMbE8sAAqSCU4mo2MhtQ=; b=iYT+j1Vm9r1RIX5mN2XpVM2X5ZUVKuBtFQ8O0ZGwipfZ1745sqPv5MFw3ywgIF2t2F /xKzyQjFboOWEyWHC6z8yXQw0hFeOHG7ysS63ucBpntbQxRha5FkTMNLENALERAnsGVG NEgyU7q2gyQZavdUOGFqD3IFn7LoFT5clBcMEaPBevMj59tzqRWgxpYo8ZvssH/Z4OMy +FCEHM8ba23uzwHZguKnltw5xX6G9nmm7HXCt81cyzkKIlo0XkAazv0rxENBUS8jQT7e jdgtXWDH20VC3cCEeFOf2Sbg9D0zTAIgf9pHcp17JckWaDAkS8GIKPH9AUDlGXmwYj9N dIQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ACEC0mxq0jURSzQ3qQmf4WSNMbE8sAAqSCU4mo2MhtQ=; b=FnFZvpO3NjSyvzryYoLWxp4zuqKu/FKevbzOZTJbZZNzuLuthizGYt/4to6g9KBsjb xsgRNSCmRCejLS5BlGhPqaipkS0DDwyIE6MIYXOh/m0/Tl4XiLHyFa3EZg5zvv+u86Ac k/ukk6MDbGGac9FO3b6NIAjB9JFdHg0nAjCaz+cu9a3RPK/7wSQidCbhYdUVkDhDKCn7 Ds+KuaKa8dBscBHG4rVkJIeYIRLMwqhI/BKZS5CK4U2ONqJTKe9C9ClpDpPxJK12biqf /Ps3Gt8S593pYESKrqd89CdZLtBFjDdeKe1+brocoYm8eCFAwOxLT2MJZlNlfjP4MU03 2urQ== X-Gm-Message-State: AHPjjUhX4rEjaOTL4WQvW/1S1i2zSXA5wX2w6ygOKUCFpTmJwWqXHR82 tZHRgJfklCXl0+1P X-Google-Smtp-Source: AOwi7QDzfSc/8DhulzQaELr9UPQ7Xu0yU2Tes1IZ88N01oNncbeufWA0YPG7fR/S8kum1xJ6HQ5VWA== X-Received: by 10.99.66.196 with SMTP id p187mr182172pga.0.1505775917752; Mon, 18 Sep 2017 16:05:17 -0700 (PDT) Received: from tharvey.pdc.gateworks.com (68-189-91-139.static.snlo.ca.charter.com. [68.189.91.139]) by smtp.gmail.com with ESMTPSA id v25sm537114pfg.52.2017.09.18.16.05.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Sep 2017 16:05:16 -0700 (PDT) From: Tim Harvey To: Steve Longerbeam , Philipp Zabel , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] media: imx: Fix VDIC CSI1 selection Date: Mon, 18 Sep 2017 16:08:16 -0700 Message-Id: <1505776096-15867-1-git-send-email-tharvey@gateworks.com> X-Mailer: git-send-email 2.7.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When using VDIC with CSI1, make sure to select the correct CSI in IPU_CONF. Fixes: f0d9c8924e2c3376 ("[media] media: imx: Add IC subdev drivers") Suggested-by: Marek Vasut Signed-off-by: Tim Harvey Acked-by: Steve Longerbeam --- drivers/staging/media/imx/imx-ic-prp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/imx/imx-ic-prp.c b/drivers/staging/media/imx/imx-ic-prp.c index c2bb5ef..9e41987 100644 --- a/drivers/staging/media/imx/imx-ic-prp.c +++ b/drivers/staging/media/imx/imx-ic-prp.c @@ -320,9 +320,10 @@ static int prp_link_validate(struct v4l2_subdev *sd, * the ->PRPENC link cannot be enabled if the source * is the VDIC */ - if (priv->sink_sd_prpenc) + if (priv->sink_sd_prpenc) { ret = -EINVAL; - goto out; + goto out; + } } else { /* the source is a CSI */ if (!csi) {