diff options
| author | Mark Brown <broonie@kernel.org> | 2023-06-16 14:55:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-06-16 14:55:20 +0100 |
| commit | 1a32b4b9a6229233de70cec28fb5a87fabac2c41 (patch) | |
| tree | 773f8a5c40ac3176d2a0613c51fc4cd333b1bcc2 /sound/soc/generic | |
| parent | 928314eb06709e3861ce3e2c7e9ef3f83ba8691b (diff) | |
| parent | f9fd804aa0a36f15a35ca070ec4c52650876cc29 (diff) | |
ASoC: Merge fixes due to dependencies
So we can apply the tlv320aic3xxx DT conversion.
Diffstat (limited to 'sound/soc/generic')
| -rw-r--r-- | sound/soc/generic/simple-card-utils.c | 2 | ||||
| -rw-r--r-- | sound/soc/generic/simple-card.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index f94c48aa126c..3af056026fa2 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -314,7 +314,7 @@ int asoc_simple_startup(struct snd_pcm_substream *substream) } ret = snd_pcm_hw_constraint_minmax(substream->runtime, SNDRV_PCM_HW_PARAM_RATE, fixed_rate, fixed_rate); - if (ret) + if (ret < 0) goto codec_err; } diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 6f044cc8357e..5a5e4ecd0f61 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -416,6 +416,7 @@ static int __simple_for_each_link(struct asoc_simple_priv *priv, if (ret < 0) { of_node_put(codec); + of_node_put(plat); of_node_put(np); goto error; } |