linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] media: imx: imx7-media-csi: fix missing clk_disable_unprepare() in imx7_csi_init()
@ 2023-01-04  9:39 Yang Yingliang
  2023-01-04 12:26 ` Laurent Pinchart
  2023-01-04 16:25 ` Rui Miguel Silva
  0 siblings, 2 replies; 3+ messages in thread
From: Yang Yingliang @ 2023-01-04  9:39 UTC (permalink / raw)
  To: linux-media
  Cc: laurent.pinchart, rmfrfs, hverkuil-cisco, mchehab, yangyingliang

Add missing clk_disable_unprepare(), if imx7_csi_dma_setup() fails
in imx7_csi_init().

Fixes: ff43ca911978 ("media: imx: imx7-media-csi: Move CSI configuration before source start")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/media/platform/nxp/imx7-media-csi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c
index 886374d3a6ff..1ef92c8c0098 100644
--- a/drivers/media/platform/nxp/imx7-media-csi.c
+++ b/drivers/media/platform/nxp/imx7-media-csi.c
@@ -638,8 +638,10 @@ static int imx7_csi_init(struct imx7_csi *csi)
 	imx7_csi_configure(csi);
 
 	ret = imx7_csi_dma_setup(csi);
-	if (ret < 0)
+	if (ret < 0) {
+		clk_disable_unprepare(csi->mclk);
 		return ret;
+	}
 
 	return 0;
 }
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] media: imx: imx7-media-csi: fix missing clk_disable_unprepare() in imx7_csi_init()
  2023-01-04  9:39 [PATCH] media: imx: imx7-media-csi: fix missing clk_disable_unprepare() in imx7_csi_init() Yang Yingliang
@ 2023-01-04 12:26 ` Laurent Pinchart
  2023-01-04 16:25 ` Rui Miguel Silva
  1 sibling, 0 replies; 3+ messages in thread
From: Laurent Pinchart @ 2023-01-04 12:26 UTC (permalink / raw)
  To: Yang Yingliang; +Cc: linux-media, rmfrfs, hverkuil-cisco, mchehab

Hi Yang,

Thank you for the patch.

On Wed, Jan 04, 2023 at 05:39:21PM +0800, Yang Yingliang wrote:
> Add missing clk_disable_unprepare(), if imx7_csi_dma_setup() fails
> in imx7_csi_init().
> 
> Fixes: ff43ca911978 ("media: imx: imx7-media-csi: Move CSI configuration before source start")
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/media/platform/nxp/imx7-media-csi.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c
> index 886374d3a6ff..1ef92c8c0098 100644
> --- a/drivers/media/platform/nxp/imx7-media-csi.c
> +++ b/drivers/media/platform/nxp/imx7-media-csi.c
> @@ -638,8 +638,10 @@ static int imx7_csi_init(struct imx7_csi *csi)
>  	imx7_csi_configure(csi);
>  
>  	ret = imx7_csi_dma_setup(csi);
> -	if (ret < 0)
> +	if (ret < 0) {
> +		clk_disable_unprepare(csi->mclk);
>  		return ret;
> +	}
>  
>  	return 0;
>  }

-- 
Regards,

Laurent Pinchart

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] media: imx: imx7-media-csi: fix missing clk_disable_unprepare() in imx7_csi_init()
  2023-01-04  9:39 [PATCH] media: imx: imx7-media-csi: fix missing clk_disable_unprepare() in imx7_csi_init() Yang Yingliang
  2023-01-04 12:26 ` Laurent Pinchart
@ 2023-01-04 16:25 ` Rui Miguel Silva
  1 sibling, 0 replies; 3+ messages in thread
From: Rui Miguel Silva @ 2023-01-04 16:25 UTC (permalink / raw)
  To: Yang Yingliang, linux-media
  Cc: laurent.pinchart, hverkuil-cisco, mchehab, yangyingliang

Hey Yingliang,

Yang Yingliang <yangyingliang@huawei.com> writes:

> Add missing clk_disable_unprepare(), if imx7_csi_dma_setup() fails
> in imx7_csi_init().
>
> Fixes: ff43ca911978 ("media: imx: imx7-media-csi: Move CSI configuration before source start")
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

LGTM, Many thanks.

Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com>

Cheers,
   Rui
   
> ---
>  drivers/media/platform/nxp/imx7-media-csi.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c
> index 886374d3a6ff..1ef92c8c0098 100644
> --- a/drivers/media/platform/nxp/imx7-media-csi.c
> +++ b/drivers/media/platform/nxp/imx7-media-csi.c
> @@ -638,8 +638,10 @@ static int imx7_csi_init(struct imx7_csi *csi)
>  	imx7_csi_configure(csi);
>  
>  	ret = imx7_csi_dma_setup(csi);
> -	if (ret < 0)
> +	if (ret < 0) {
> +		clk_disable_unprepare(csi->mclk);
>  		return ret;
> +	}
>  
>  	return 0;
>  }
> -- 
> 2.25.1

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-01-04 16:26 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-04  9:39 [PATCH] media: imx: imx7-media-csi: fix missing clk_disable_unprepare() in imx7_csi_init() Yang Yingliang
2023-01-04 12:26 ` Laurent Pinchart
2023-01-04 16:25 ` Rui Miguel Silva

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).