| Message ID | 20210226185653.1071321-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1730ef62874dbdc53dc2abfa430f09f0b304bafc |
| Headers | show |
| Series | ASoC: Intel: boards: sof-wm8804: add check for PLL setting | expand |
On 2/26/21 12:56 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Currently the return from snd_soc_dai_set_pll is not checking for > failure, this is the only driver in the kernel that ignores this, > so it probably should be added for sake of completeness. Fix this > by adding an error return check. > > Addresses-Coverity: ("Unchecked return value") > Fixes: f139546fb7d4 ("ASoC: Intel: boards: sof-wm8804: support for Hifiberry Digiplus boards") > Signed-off-by: Colin Ian King <colin.king@canonical.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > sound/soc/intel/boards/sof_wm8804.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/intel/boards/sof_wm8804.c b/sound/soc/intel/boards/sof_wm8804.c > index a46ba13e8eb0..6a181e45143d 100644 > --- a/sound/soc/intel/boards/sof_wm8804.c > +++ b/sound/soc/intel/boards/sof_wm8804.c > @@ -124,7 +124,11 @@ static int sof_wm8804_hw_params(struct snd_pcm_substream *substream, > } > > snd_soc_dai_set_clkdiv(codec_dai, WM8804_MCLK_DIV, mclk_div); > - snd_soc_dai_set_pll(codec_dai, 0, 0, sysclk, mclk_freq); > + ret = snd_soc_dai_set_pll(codec_dai, 0, 0, sysclk, mclk_freq); > + if (ret < 0) { > + dev_err(rtd->card->dev, "Failed to set WM8804 PLL\n"); > + return ret; > + } > > ret = snd_soc_dai_set_sysclk(codec_dai, WM8804_TX_CLKSRC_PLL, > sysclk, SND_SOC_CLOCK_OUT); >
On Fri, 26 Feb 2021 18:56:53 +0000, Colin King wrote: > Currently the return from snd_soc_dai_set_pll is not checking for > failure, this is the only driver in the kernel that ignores this, > so it probably should be added for sake of completeness. Fix this > by adding an error return check. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: Intel: boards: sof-wm8804: add check for PLL setting commit: e067855b814600248234a2a7283a7a9006e5aadc All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/intel/boards/sof_wm8804.c b/sound/soc/intel/boards/sof_wm8804.c index a46ba13e8eb0..6a181e45143d 100644 --- a/sound/soc/intel/boards/sof_wm8804.c +++ b/sound/soc/intel/boards/sof_wm8804.c @@ -124,7 +124,11 @@ static int sof_wm8804_hw_params(struct snd_pcm_substream *substream, } snd_soc_dai_set_clkdiv(codec_dai, WM8804_MCLK_DIV, mclk_div); - snd_soc_dai_set_pll(codec_dai, 0, 0, sysclk, mclk_freq); + ret = snd_soc_dai_set_pll(codec_dai, 0, 0, sysclk, mclk_freq); + if (ret < 0) { + dev_err(rtd->card->dev, "Failed to set WM8804 PLL\n"); + return ret; + } ret = snd_soc_dai_set_sysclk(codec_dai, WM8804_TX_CLKSRC_PLL, sysclk, SND_SOC_CLOCK_OUT);