Message ID | 1505776096-15867-1-git-send-email-tharvey@gateworks.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Thanks Tim for catching this error. Acked-by: Steve Longerbeam <steve_longerbeam@mentor.com> 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 <marex@denx.de> > Signed-off-by: Tim Harvey <tharvey@gateworks.com> > --- > 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) {
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) {
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 <marex@denx.de> Signed-off-by: Tim Harvey <tharvey@gateworks.com> --- drivers/staging/media/imx/imx-ic-prp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)