Patch "ASoC: Intel: boards: sof-wm8804: add check for PLL setting" has been added to the 5.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    ASoC: Intel: boards: sof-wm8804: add check for PLL setting

to the 5.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     asoc-intel-boards-sof-wm8804-add-check-for-pll-setti.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit c4292a3fed12c43e00610037cf9db69aee00425c
Author: Colin Ian King <colin.king@xxxxxxxxxxxxx>
Date:   Fri Feb 26 18:56:53 2021 +0000

    ASoC: Intel: boards: sof-wm8804: add check for PLL setting
    
    [ Upstream commit 1730ef62874dbdc53dc2abfa430f09f0b304bafc ]
    
    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@xxxxxxxxxxxxx>
    Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20210226185653.1071321-1-colin.king@xxxxxxxxxxxxx
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

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);