]> git.hungrycats.org Git - linux/commitdiff
ASoC: rt5682: Return devm_of_clk_add_hw_provider to transfer the error
authorMa Ke <make24@iscas.ac.cn>
Fri, 30 Aug 2024 14:31:54 +0000 (22:31 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 Oct 2024 14:33:26 +0000 (16:33 +0200)
commit fcca6d05ef49d5650514ea1dcfd12e4ae3ff2be6 upstream.

Return devm_of_clk_add_hw_provider() in order to transfer the error, if it
fails due to resource allocation failure or device tree clock provider
registration failure.

Cc: stable@vger.kernel.org
Fixes: ebbfabc16d23 ("ASoC: rt5682: Add CCF usage for providing I2S clks")
Signed-off-by: Ma Ke <make24@iscas.ac.cn>
Link: https://patch.msgid.link/20240830143154.3448004-1-make24@iscas.ac.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/codecs/rt5682.c

index e3aca9c785a079296213628dcf5a4ec28ebaa252..aa163ec4086223ea5296501265d572297bbec143 100644 (file)
@@ -2903,8 +2903,10 @@ int rt5682_register_dai_clks(struct rt5682_priv *rt5682)
                }
 
                if (dev->of_node) {
-                       devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get,
+                       ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get,
                                                    dai_clk_hw);
+                       if (ret)
+                               return ret;
                } else {
                        ret = devm_clk_hw_register_clkdev(dev, dai_clk_hw,
                                                          init.name,