ASoC: da7219: Fix an error handling path in da7219_register_dai_clks()

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>

diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
index 50ecf30..4746c87 100644 (file)
--- 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);