diff options
author | Mark Brown <broonie@kernel.org> | 2018-06-05 16:25:41 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-06-05 16:25:41 +0200 |
commit | aac521e880f221e6d4e67b7061022dbecace0df0 (patch) | |
tree | fca79e92df04b0b433d2c665dc5baf56e603ac25 /sound/soc/intel | |
parent | ASoC: dapm: delete dapm_kcontrol_data paths list before freeing it (diff) | |
parent | MAINTAINERS: update sound/soc/intel maintainers (diff) | |
download | linux-aac521e880f221e6d4e67b7061022dbecace0df0.tar.xz linux-aac521e880f221e6d4e67b7061022dbecace0df0.zip |
Merge branch 'asoc-4.17' into asoc-4.18 merge window
Diffstat (limited to 'sound/soc/intel')
-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 1be788e04193..987720e203f9 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -861,9 +861,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 |