lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 404/862] mmc: wmt-sdmmc: Fix an error handling path in wmt_mci_probe()
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit cb58188ad90a61784a56a64f5107faaf2ad323e7 ]

    A dma_free_coherent() call is missing in the error handling path of the
    probe, as already done in the remove function.

    Fixes: 3a96dff0f828 ("mmc: SD/MMC Host Controller for Wondermedia WM8505/WM8650")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
    Link: https://lore.kernel.org/r/53fc6ffa5d1c428fefeae7d313cf4a669c3a1e98.1663873255.git.christophe.jaillet@wanadoo.fr
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mmc/host/wmt-sdmmc.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/mmc/host/wmt-sdmmc.c b/drivers/mmc/host/wmt-sdmmc.c
    index 163ac9df8cca..9b5c503e3a3f 100644
    --- a/drivers/mmc/host/wmt-sdmmc.c
    +++ b/drivers/mmc/host/wmt-sdmmc.c
    @@ -846,7 +846,7 @@ static int wmt_mci_probe(struct platform_device *pdev)
    if (IS_ERR(priv->clk_sdmmc)) {
    dev_err(&pdev->dev, "Error getting clock\n");
    ret = PTR_ERR(priv->clk_sdmmc);
    - goto fail5;
    + goto fail5_and_a_half;
    }

    ret = clk_prepare_enable(priv->clk_sdmmc);
    @@ -863,6 +863,9 @@ static int wmt_mci_probe(struct platform_device *pdev)
    return 0;
    fail6:
    clk_put(priv->clk_sdmmc);
    +fail5_and_a_half:
    + dma_free_coherent(&pdev->dev, mmc->max_blk_count * 16,
    + priv->dma_desc_buffer, priv->dma_desc_device_addr);
    fail5:
    free_irq(dma_irq, priv);
    fail4:
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 15:59    [W:2.511 / U:1.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site