Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751476AbdIRXHd (ORCPT ); Mon, 18 Sep 2017 19:07:33 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:33154 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750747AbdIRXHb (ORCPT ); Mon, 18 Sep 2017 19:07:31 -0400 X-Google-Smtp-Source: AOwi7QBrbDhU3j/UTbazszjYXDHclzqPhKHnuxz92dF9o0agHh2DZdjAsNS3h6tQcpxfpQ1UpJ9wNg== Subject: Re: [PATCH] media: imx: Fix VDIC CSI1 selection To: Tim Harvey , Philipp Zabel , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org References: <1505776096-15867-1-git-send-email-tharvey@gateworks.com> From: Steve Longerbeam Message-ID: <9971527a-cc87-9ecd-8a4c-0569fdaeb11d@gmail.com> Date: Mon, 18 Sep 2017 16:07:28 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <1505776096-15867-1-git-send-email-tharvey@gateworks.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1076 Lines: 33 Thanks Tim for catching this error. Acked-by: Steve Longerbeam On 09/18/2017 04:08 PM, Tim Harvey wrote: > 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) {