media: imx: Fix VDIC CSI1 selection

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>
Acked-by: Steve Longerbeam <steve_longerbeam@mentor.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/staging/media/imx/imx-ic-prp.c b/drivers/staging/media/imx/imx-ic-prp.c
index c2bb5ef2acb4dd1834e454ead27a2608f116a73e..9e41987f98843a98a0aa46cc05c209867efb591f 100644 (file)
--- 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) {