lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 156/606] dmaengine: tegra210-adma: Fix an error handling path in 'tegra_adma_probe()'
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    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 <christophe.jaillet@wanadoo.fr>
    Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
    Acked-by: Thierry Reding <treding@nvidia.com>
    Link: https://lore.kernel.org/r/20200516214205.276266-1-christophe.jaillet@wanadoo.fr
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    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 6e1268552f74..914901a680c8 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
    \
     
     \ /
      Last update: 2020-06-09 02:32    [W:2.178 / U:23.768 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site