From: Mark Brown <broonie@kernel.org>
Date: Tue, 26 Sep 2023 14:14:44 +0000 (+0200)
Subject: ASoC: Merge up fixes
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=af08458988cb5dd4b4ff87cfb9da81c6d2c8ef7a;p=linux.git

ASoC: Merge up fixes

For the benefit of CI.
---

af08458988cb5dd4b4ff87cfb9da81c6d2c8ef7a
diff --cc sound/soc/fsl/fsl-asoc-card.c
index 5b31c12a56f93,bab7d34cf585b..0957ff7c55c2f
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@@ -248,9 -248,9 +248,9 @@@ static int fsl_asoc_card_hw_free(struc
  
  	priv->streams &= ~BIT(substream->stream);
  
- 	if (!priv->streams && codec_priv->pll_id && codec_priv->fll_id) {
+ 	if (!priv->streams && codec_priv->pll_id >= 0 && codec_priv->fll_id >= 0) {
  		/* Force freq to be free_freq to avoid error message in codec */
 -		ret = snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0),
 +		ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_codec(rtd, 0),
  					     codec_priv->mclk_id,
  					     codec_priv->free_freq,
  					     SND_SOC_CLOCK_IN);
diff --cc sound/soc/generic/simple-card.c
index a88812ab3ed17,274417e39e7de..b95b86315502a
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@@ -769,8 -772,8 +771,8 @@@ static int simple_probe(struct platform
  		    !cinfo->codec ||
  		    !cinfo->platform ||
  		    !cinfo->cpu_dai.name) {
 -			dev_err(dev, "insufficient asoc_simple_card_info settings\n");
 +			dev_err(dev, "insufficient simple_util_info settings\n");
- 			return -EINVAL;
+ 			goto err;
  		}
  
  		cpus			= dai_link->cpus;