dmaengine Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] dmaengine: tegra210-adma: Fix an error handling path in 'tegra_adma_probe()'
@ 2020-05-16 21:42 Christophe JAILLET
  2020-05-18 11:43 ` Jon Hunter
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Christophe JAILLET @ 2020-05-16 21:42 UTC (permalink / raw)
  To: ldewangan, jonathanh, dan.j.williams, vkoul, thierry.reding
  Cc: dmaengine, linux-tegra, linux-kernel, kernel-janitors,
	Christophe JAILLET

Commit b53611fb1ce9 ("dmaengine: tegra210-adma: Fix crash during probe")
has moved some code in the probe function and reordered the error handling
path accordingly.
However, a goto has been missed.

Fix it and goto the right label if 'dma_async_device_register()' fails, so
that all resources are released.

Fixes: b53611fb1ce9 ("dmaengine: tegra210-adma: Fix crash during probe")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/dma/tegra210-adma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
index c4ce5dfb149b..db58d7e4f9fe 100644
--- a/drivers/dma/tegra210-adma.c
+++ b/drivers/dma/tegra210-adma.c
@@ -900,7 +900,7 @@ static int tegra_adma_probe(struct platform_device *pdev)
 	ret = dma_async_device_register(&tdma->dma_dev);
 	if (ret < 0) {
 		dev_err(&pdev->dev, "ADMA registration failed: %d\n", ret);
-		goto irq_dispose;
+		goto rpm_put;
 	}
 
 	ret = of_dma_controller_register(pdev->dev.of_node,
-- 
2.25.1


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

* Re: [PATCH] dmaengine: tegra210-adma: Fix an error handling path in 'tegra_adma_probe()'
  2020-05-16 21:42 [PATCH] dmaengine: tegra210-adma: Fix an error handling path in 'tegra_adma_probe()' Christophe JAILLET
@ 2020-05-18 11:43 ` Jon Hunter
  2020-05-19 16:25 ` Thierry Reding
  2020-05-19 16:56 ` Vinod Koul
  2 siblings, 0 replies; 4+ messages in thread
From: Jon Hunter @ 2020-05-18 11:43 UTC (permalink / raw)
  To: Christophe JAILLET, ldewangan, dan.j.williams, vkoul, thierry.reding
  Cc: dmaengine, linux-tegra, linux-kernel, kernel-janitors


On 16/05/2020 22:42, Christophe JAILLET wrote:
> Commit b53611fb1ce9 ("dmaengine: tegra210-adma: Fix crash during probe")
> has moved some code in the probe function and reordered the error handling
> path accordingly.
> However, a goto has been missed.
> 
> Fix it and goto the right label if 'dma_async_device_register()' fails, so
> that all resources are released.
> 
> Fixes: b53611fb1ce9 ("dmaengine: tegra210-adma: Fix crash during probe")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>  drivers/dma/tegra210-adma.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
> index c4ce5dfb149b..db58d7e4f9fe 100644
> --- a/drivers/dma/tegra210-adma.c
> +++ b/drivers/dma/tegra210-adma.c
> @@ -900,7 +900,7 @@ static int tegra_adma_probe(struct platform_device *pdev)
>  	ret = dma_async_device_register(&tdma->dma_dev);
>  	if (ret < 0) {
>  		dev_err(&pdev->dev, "ADMA registration failed: %d\n", ret);
> -		goto irq_dispose;
> +		goto rpm_put;
>  	}
>  
>  	ret = of_dma_controller_register(pdev->dev.of_node,


Thanks for fixing this!

Reviewed-by: Jon Hunter <jonathanh@nvidia.com>

Cheers
Jon

-- 
nvpublic

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

* Re: [PATCH] dmaengine: tegra210-adma: Fix an error handling path in 'tegra_adma_probe()'
  2020-05-16 21:42 [PATCH] dmaengine: tegra210-adma: Fix an error handling path in 'tegra_adma_probe()' Christophe JAILLET
  2020-05-18 11:43 ` Jon Hunter
@ 2020-05-19 16:25 ` Thierry Reding
  2020-05-19 16:56 ` Vinod Koul
  2 siblings, 0 replies; 4+ messages in thread
From: Thierry Reding @ 2020-05-19 16:25 UTC (permalink / raw)
  To: Christophe JAILLET
  Cc: ldewangan, jonathanh, dan.j.williams, vkoul, dmaengine,
	linux-tegra, linux-kernel, kernel-janitors


[-- Attachment #1: Type: text/plain, Size: 692 bytes --]

On Sat, May 16, 2020 at 11:42:05PM +0200, Christophe JAILLET wrote:
> Commit b53611fb1ce9 ("dmaengine: tegra210-adma: Fix crash during probe")
> has moved some code in the probe function and reordered the error handling
> path accordingly.
> However, a goto has been missed.
> 
> Fix it and goto the right label if 'dma_async_device_register()' fails, so
> that all resources are released.
> 
> Fixes: b53611fb1ce9 ("dmaengine: tegra210-adma: Fix crash during probe")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>  drivers/dma/tegra210-adma.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Acked-by: Thierry Reding <treding@nvidia.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

* Re: [PATCH] dmaengine: tegra210-adma: Fix an error handling path in 'tegra_adma_probe()'
  2020-05-16 21:42 [PATCH] dmaengine: tegra210-adma: Fix an error handling path in 'tegra_adma_probe()' Christophe JAILLET
  2020-05-18 11:43 ` Jon Hunter
  2020-05-19 16:25 ` Thierry Reding
@ 2020-05-19 16:56 ` Vinod Koul
  2 siblings, 0 replies; 4+ messages in thread
From: Vinod Koul @ 2020-05-19 16:56 UTC (permalink / raw)
  To: Christophe JAILLET
  Cc: ldewangan, jonathanh, dan.j.williams, thierry.reding, dmaengine,
	linux-tegra, linux-kernel, kernel-janitors

On 16-05-20, 23:42, Christophe JAILLET wrote:
> Commit b53611fb1ce9 ("dmaengine: tegra210-adma: Fix crash during probe")
> has moved some code in the probe function and reordered the error handling
> path accordingly.
> However, a goto has been missed.
> 
> Fix it and goto the right label if 'dma_async_device_register()' fails, so
> that all resources are released.

Applied for fixes, thanks

-- 
~Vinod

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

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-16 21:42 [PATCH] dmaengine: tegra210-adma: Fix an error handling path in 'tegra_adma_probe()' Christophe JAILLET
2020-05-18 11:43 ` Jon Hunter
2020-05-19 16:25 ` Thierry Reding
2020-05-19 16:56 ` Vinod Koul

dmaengine Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/dmaengine/0 dmaengine/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dmaengine dmaengine/ https://lore.kernel.org/dmaengine \
		dmaengine@vger.kernel.org
	public-inbox-index dmaengine

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.dmaengine


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git