From: Greg Kroah-Hartman Date: Sat, 23 May 2020 12:21:26 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v4.4.225~49 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=953ebb4cff2b0468b56d6ec31d6bcbd61a64bdde;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: dmaengine-tegra210-adma-fix-an-error-handling-path-in-tegra_adma_probe.patch --- diff --git a/queue-4.9/dmaengine-tegra210-adma-fix-an-error-handling-path-in-tegra_adma_probe.patch b/queue-4.9/dmaengine-tegra210-adma-fix-an-error-handling-path-in-tegra_adma_probe.patch new file mode 100644 index 00000000000..5caa106c53a --- /dev/null +++ b/queue-4.9/dmaengine-tegra210-adma-fix-an-error-handling-path-in-tegra_adma_probe.patch @@ -0,0 +1,40 @@ +From 3a5fd0dbd87853f8bd2ea275a5b3b41d6686e761 Mon Sep 17 00:00:00 2001 +From: Christophe JAILLET +Date: Sat, 16 May 2020 23:42:05 +0200 +Subject: dmaengine: tegra210-adma: Fix an error handling path in 'tegra_adma_probe()' + +From: Christophe JAILLET + +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: Christophe JAILLET +Reviewed-by: Jon Hunter +Acked-by: Thierry Reding +Link: https://lore.kernel.org/r/20200516214205.276266-1-christophe.jaillet@wanadoo.fr +Signed-off-by: Vinod Koul +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/dma/tegra210-adma.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/dma/tegra210-adma.c ++++ b/drivers/dma/tegra210-adma.c +@@ -793,7 +793,7 @@ static int tegra_adma_probe(struct platf + 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, diff --git a/queue-4.9/series b/queue-4.9/series index 4f88fd81398..1369e949e64 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -47,3 +47,4 @@ l2tp-initialise-l2tp_eth-sessions-before-registering-them.patch l2tp-protect-sock-pointer-of-struct-pppol2tp_session-with-rcu.patch l2tp-initialise-ppp-sessions-before-registering-them.patch alsa-pcm-fix-incorrect-hw_base-increase.patch +dmaengine-tegra210-adma-fix-an-error-handling-path-in-tegra_adma_probe.patch