diff options
| author | Colin Ian King <colin.king@canonical.com> | 2021-10-08 10:54:30 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-10-08 17:22:52 +0100 |
| commit | cacbce45f5df9840f672129bdccd3f3e02343c0e (patch) | |
| tree | 4ed229ed3148fb1f74fbc3e5d78b42536e5ff1f4 /sound/soc/rockchip | |
| parent | 74daadc7fde5dc3326ba2158a60c1c028f2e19b9 (diff) | |
| download | linux-cacbce45f5df9840f672129bdccd3f3e02343c0e.tar.bz2 | |
ASoC: rockchip: i2s-tdm: Fix error handling on i2s_tdm_prepare_enable_mclk failure
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>
Diffstat (limited to 'sound/soc/rockchip')
| -rw-r--r-- | sound/soc/rockchip/rockchip_i2s_tdm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c index cc5a2f9d3948..396277eaa417 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.c +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c @@ -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; } |