From: Ma Ke <make24@xxxxxxxxxxx> 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@xxxxxxxxxxxxxxx Fixes: ebbfabc16d23 ("ASoC: rt5682: Add CCF usage for providing I2S clks") Signed-off-by: Ma Ke <make24@xxxxxxxxxxx> Link: https://patch.msgid.link/20240830143154.3448004-1-make24@xxxxxxxxxxx Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- sound/soc/codecs/rt5682.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -2903,8 +2903,10 @@ int rt5682_register_dai_clks(struct rt56 } 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, Patches currently in stable-queue which might be from make24@xxxxxxxxxxx are queue-6.11/drivers-media-dvb-frontends-rtl2830-fix-an-out-of-bo.patch queue-6.11/asoc-rt5682s-return-devm_of_clk_add_hw_provider-to-t.patch queue-6.11/asoc-rt5682-return-devm_of_clk_add_hw_provider-to-transfer-the-error.patch queue-6.11/spi-ppc4xx-handle-irq_of_parse_and_map-errors.patch queue-6.11/drivers-media-dvb-frontends-rtl2832-fix-an-out-of-bo.patch