Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4bea847 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

dmaengine: tegra210-adma: Fix an error handling path in 'tegra_adma_probe()' 



commit 3a5fd0dbd87853f8bd2ea275a5b3b41d6686e761 upstream.

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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarJon Hunter <jonathanh@nvidia.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20200516214205.276266-1-christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c7018495

drivers/dma/tegra210-adma.c

+1 −1
Original line number Diff line number Diff line
@@ -793,7 +793,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,