lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 238/530] ASoC: da7219: Fix an error handling path in da7219_register_dai_clks()
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit abb4e4349afe7eecdb0499582f1c777031e3a7c8 ]

    If clk_hw_register() fails, the corresponding clk should not be
    unregistered.

    To handle errors from loops, clean up partial iterations before doing the
    goto. So add a clk_hw_unregister().
    Then use a while (--i >= 0) loop in the unwind section.

    Fixes: 78013a1cf297 ("ASoC: da7219: Fix clock handling around codec level probe")
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
    Link: https://lore.kernel.org/r/e4acceab57a0d9e477a8d5890a45c5309e553e7c.1663875789.git.christophe.jaillet@wanadoo.fr
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/da7219.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
    index c7493549a9a5..da4c24b8dae5 100644
    --- a/sound/soc/codecs/da7219.c
    +++ b/sound/soc/codecs/da7219.c
    @@ -2196,6 +2196,7 @@ static int da7219_register_dai_clks(struct snd_soc_component *component)
    dai_clk_lookup = clkdev_hw_create(dai_clk_hw, init.name,
    "%s", dev_name(dev));
    if (!dai_clk_lookup) {
    + clk_hw_unregister(dai_clk_hw);
    ret = -ENOMEM;
    goto err;
    } else {
    @@ -2217,12 +2218,12 @@ static int da7219_register_dai_clks(struct snd_soc_component *component)
    return 0;

    err:
    - do {
    + while (--i >= 0) {
    if (da7219->dai_clks_lookup[i])
    clkdev_drop(da7219->dai_clks_lookup[i]);

    clk_hw_unregister(&da7219->dai_clks_hw[i]);
    - } while (i-- > 0);
    + }

    if (np)
    kfree(da7219->clk_hw_data);
    --
    2.35.1


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