diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-09-14 09:09:11 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-09-14 09:09:11 +0200 |
| commit | 134536c21275bb3410cd1f10c5e369d30702741d (patch) | |
| tree | feea452f8f3868141b8718c005401d5557e19371 /sound/soc/meson | |
| parent | c491b044cf5f8236742887ba59b30032036e4ac8 (diff) | |
| parent | 4f9a71435953f941969a4f017e2357db62d85a86 (diff) | |
Merge tag 'asoc-fix-v6.11-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.11
A few last minute fixes, plus an update for Pierre's contact details and
status. It'd be good to get these into v6.11 (especially the
MAINTAINERS update) but it wouldn't be the end of the world if they
waited for the merge window, none of them are super remarkable and it's
just a question of timing that they're last minute.
Diffstat (limited to 'sound/soc/meson')
| -rw-r--r-- | sound/soc/meson/axg-card.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index 8c5605c1e34e..eb0302f20740 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -104,7 +104,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card, int *index) { struct meson_card *priv = snd_soc_card_get_drvdata(card); - struct snd_soc_dai_link *pad = &card->dai_link[*index]; + struct snd_soc_dai_link *pad; struct snd_soc_dai_link *lb; struct snd_soc_dai_link_component *dlc; int ret; @@ -114,6 +114,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card, if (ret) return ret; + pad = &card->dai_link[*index]; lb = &card->dai_link[*index + 1]; lb->name = devm_kasprintf(card->dev, GFP_KERNEL, "%s-lb", pad->name); |