lkml.org 
[lkml]   [2022]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 131/475] ASoC: ti: davinci-i2s: Add check for clk_enable()
    Date
    From: Jiasheng Jiang <jiasheng@iscas.ac.cn>

    [ Upstream commit ed7c9fef11931fc5d32a83d68017ff390bf5c280 ]

    As the potential failure of the clk_enable(),
    it should be better to check it and return error
    if fails.

    Fixes: 5f9a50c3e55e ("ASoC: Davinci: McBSP: add device tree support for McBSP")
    Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
    Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com>
    Link: https://lore.kernel.org/r/20220228031540.3571959-1-jiasheng@iscas.ac.cn
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/ti/davinci-i2s.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/sound/soc/ti/davinci-i2s.c b/sound/soc/ti/davinci-i2s.c
    index d89b5c928c4d..b2b2dcdb05d4 100644
    --- a/sound/soc/ti/davinci-i2s.c
    +++ b/sound/soc/ti/davinci-i2s.c
    @@ -708,7 +708,9 @@ static int davinci_i2s_probe(struct platform_device *pdev)
    dev->clk = clk_get(&pdev->dev, NULL);
    if (IS_ERR(dev->clk))
    return -ENODEV;
    - clk_enable(dev->clk);
    + ret = clk_enable(dev->clk);
    + if (ret)
    + goto err_put_clk;

    dev->dev = &pdev->dev;
    dev_set_drvdata(&pdev->dev, dev);
    @@ -730,6 +732,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
    snd_soc_unregister_component(&pdev->dev);
    err_release_clk:
    clk_disable(dev->clk);
    +err_put_clk:
    clk_put(dev->clk);
    return ret;
    }
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-14 16:35    [W:4.047 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site