Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1734528 > unrolled thread
| Started by | Tim Harvey <tharvey@gateworks.com> |
|---|---|
| First post | 2017-09-19 01:10 +0200 |
| Last post | 2017-09-19 01:10 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[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
| From | Tim Harvey <tharvey@gateworks.com> |
|---|---|
| Date | 2017-09-19 01:10 +0200 |
| Subject | [PATCH] media: imx: Fix VDIC CSI1 selection |
| Message-ID | <urdkR-4FF-11@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Steve Longerbeam <slongerbeam@gmail.com> |
|---|---|
| Date | 2017-09-19 01:10 +0200 |
| Message-ID | <urdkR-4FF-13@gated-at.bofh.it> |
| In reply to | #1734528 |
Thanks Tim for catching this error.
Acked-by: Steve Longerbeam <steve_longerbeam@mentor.com>
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 <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) {
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web