ASoC: rockchip: i2s-tdm: Fix error handling on i2s_tdm_prepare_enable_mclk failure
authorColin Ian King <colin.king@canonical.com>
Fri, 8 Oct 2021 09:54:30 +0000 (10:54 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 8 Oct 2021 16:22:52 +0000 (17:22 +0100)
In the case where the call to i2s_tdm_prepare_enable_mclk fails the
function returns before the error handling goto is executed. Fix this
by removing the return do perform the intended error handling exit.

Fixes: 081068fd6414 ("ASoC: rockchip: add support for i2s-tdm controller")
Addresses-Coverity: ("Structurally dead code")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Message-Id: <20211008095430.62680-2-colin.king@canonical.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/rockchip/rockchip_i2s_tdm.c

index cc5a2f9d39480376c7d46c2893c3a88ed7446d2c..396277eaa41746f9d72823522452cbeab7d02d5d 100644 (file)
@@ -1736,8 +1736,8 @@ static int rockchip_i2s_tdm_probe(struct platform_device *pdev)
 
        ret = i2s_tdm_prepare_enable_mclk(i2s_tdm);
        if (ret) {
-               return dev_err_probe(i2s_tdm->dev, ret,
-                                    "Failed to enable one or more mclks\n");
+               ret = dev_err_probe(i2s_tdm->dev, ret,
+                                   "Failed to enable one or more mclks\n");
                goto err_disable_hclk;
        }