media: imx: Fix VDIC CSI1 selection

PATCH In review Tim Harvey 2 participants 2 messages Sep 18, 2017

Subsystems (4)

Media (V4L/DVB) Arm i.MX and Layerscape Staging Media drivers for Freescale i.MX

lore

Share & tools

lore

Tim Harvey

author

2017-09-18 23:05 UTC #0 lore raw

PATCH 1/1 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")

Signed-off-by Tim Harvey <[email protected]>

---
 drivers/staging/media/imx/imx-ic-prp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

drivers/staging/media/imx/imx-ic-prp.c +3 -2

index c2bb5ef..9e41987 100644
@@ -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) {

Signature · 1 line

2.7.4

Steve Longerbeam

maintainer Acked-by on v1 1/1

2017-09-18 23:07 UTC #1 lore raw

Thanks Tim for catching this error.

Acked-by Steve Longerbeam <[email protected]>

Quoted 27 lines · Tim Harvey

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 <[email protected]>
Signed-off-by Tim Harvey <[email protected]>
---
  drivers/staging/media/imx/imx-ic-prp.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/media/imx/imx-ic-prp.c +3 -2
index c2bb5ef..9e41987 100644
@@ -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) {