2017-09-18 23:05:20

by Tim Harvey

Subject: [PATCH] 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 <[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(-)

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

2017-09-18 23:07:33

by Steve Longerbeam

Subject: Re: [PATCH] media: imx: Fix VDIC CSI1 selection

Thanks Tim for catching this error.

Acked-by: Steve Longerbeam <[email protected]>


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 <[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(-)
>
> 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) {