[PATCH] media: imx: Fix VDIC CSI1 selection

From	Tim Harvey <tharvey@gateworks.com>
Newsgroups	linux.kernel
Subject	[PATCH] media: imx: Fix VDIC CSI1 selection
Date	2017-09-19 01:10 +0200
Message-ID	<urdkR-4FF-11@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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) {
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] media: imx: Fix VDIC CSI1 selection Tim Harvey <tharvey@gateworks.com> - 2017-09-19 01:10 +0200
  Re: [PATCH] media: imx: Fix VDIC CSI1 selection Steve Longerbeam <slongerbeam@gmail.com> - 2017-09-19 01:10 +0200

csiph-web