diff options
author | Takashi Iwai <tiwai@suse.de> | 2023-10-31 08:58:36 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2023-10-31 08:58:36 +0100 |
commit | c468b5dd759ede754b23cbc9c50b048a781d4217 (patch) | |
tree | 3ec5f17b34fbb4711253fc4698d9cacbf6b9e71b /sound/soc/codecs/cs47l15.c | |
parent | 99248c8902f505ec064cf2b0f74629016f2f4c82 (diff) | |
parent | f71e0be5d297b25453fdf4c1757b3e83e94b5f98 (diff) |
Merge branch 'for-next' into for-linus
Pull 6.7 materials
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/codecs/cs47l15.c')
-rw-r--r-- | sound/soc/codecs/cs47l15.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/cs47l15.c b/sound/soc/codecs/cs47l15.c index 1245e1a4f2a5..ab6e7cd99733 100644 --- a/sound/soc/codecs/cs47l15.c +++ b/sound/soc/codecs/cs47l15.c @@ -1246,12 +1246,12 @@ static int cs47l15_open(struct snd_soc_component *component, struct madera *madera = priv->madera; int n_adsp; - if (strcmp(asoc_rtd_to_codec(rtd, 0)->name, "cs47l15-dsp-trace") == 0) { + if (strcmp(snd_soc_rtd_to_codec(rtd, 0)->name, "cs47l15-dsp-trace") == 0) { n_adsp = 0; } else { dev_err(madera->dev, "No suitable compressed stream for DAI '%s'\n", - asoc_rtd_to_codec(rtd, 0)->name); + snd_soc_rtd_to_codec(rtd, 0)->name); return -EINVAL; } |