diff options
| author | Colin Ian King <colin.king@canonical.com> | 2018-05-02 15:29:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-05-03 10:23:54 +0900 |
| commit | de5afce2a22ef7f92e9e8583a3bdbc10e448cddf (patch) | |
| tree | eb9f7465c2029a3bc6390df7fbc077be52a9b112 /sound | |
| parent | 40c57963789d451c26269e3bc9f9e803060fd9af (diff) | |
| download | linux-stable-de5afce2a22ef7f92e9e8583a3bdbc10e448cddf.tar.gz linux-stable-de5afce2a22ef7f92e9e8583a3bdbc10e448cddf.tar.bz2 linux-stable-de5afce2a22ef7f92e9e8583a3bdbc10e448cddf.zip | |
ASoC: Intel: bytcr_rt565: fix missing assignment to ret_val
Currently, the check that ret_val is not -ENOENT is always true and
the quirk bit BYT_RY5651_MCLK_EN is never being cleared because ret_val
is always zero at this point from a previous assignment earlier on.
I believe that ret_val should actually be assigned to the return from
devm_clk_get() as this can return -ENOENT (from a deeper call to
clk_get_sys) and that was the original intention to check this.
Detected by CoverityScan, CID#1460228 ("Logically dead code")
Fixes: 02c0a3b3047f ("ASoC: Intel: bytcr_rt5651: add MCLK, quirks and cleanups")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/boards/bytcr_rt5651.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 1b1997f1d60c..bf59c7caf1d9 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -856,9 +856,10 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) if (byt_rt5651_quirk & BYT_RT5651_MCLK_EN) { priv->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3"); if (IS_ERR(priv->mclk)) { + ret_val = PTR_ERR(priv->mclk); dev_err(&pdev->dev, - "Failed to get MCLK from pmc_plt_clk_3: %ld\n", - PTR_ERR(priv->mclk)); + "Failed to get MCLK from pmc_plt_clk_3: %d\n", + ret_val); /* * Fall back to bit clock usage for -ENOENT (clock not * available likely due to missing dependencies), bail |