Commit f9cc48f1 authored Sep 19, 2017 by Tim Harvey Committed by Mauro Carvalho Chehab Oct 27, 2017

media: imx: Fix VDIC CSI1 selection



When using VDIC with CSI1, make sure to select the correct CSI in
IPU_CONF.

Fixes: f0d9c892 ("[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>

parent 7996e5c4

drivers/staging/media/imx/imx-ic-prp.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}
		} else {
		/* the source is a CSI */
		if (!csi) {