Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750974AbdIRXFU (ORCPT ); Mon, 18 Sep 2017 19:05:20 -0400 Received: from mail-pf0-f173.google.com ([209.85.192.173]:54127 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750711AbdIRXFS (ORCPT ); Mon, 18 Sep 2017 19:05:18 -0400 X-Google-Smtp-Source: AOwi7QDzfSc/8DhulzQaELr9UPQ7Xu0yU2Tes1IZ88N01oNncbeufWA0YPG7fR/S8kum1xJ6HQ5VWA== 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-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 887 Lines: 29 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 --- 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) { -- 2.7.4