diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-09-14 10:16:12 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-09-14 10:16:12 +0200 |
| commit | 64c0ce555ad2d84f497f5f584ddd31e87ac690a2 (patch) | |
| tree | 36413d636cc2f09bbec2a00036550b87d88724d9 /sound/soc/meson | |
| parent | 1a529af6f81e54f15df162a0c703459937941c54 (diff) | |
| parent | 134536c21275bb3410cd1f10c5e369d30702741d (diff) | |
Merge branch 'for-linus' into for-next
Pull 6.11 fixes to 6.12-devel branch
Signed-off-by: Takashi Iwai <tiwai@suse.de>
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 59deb332bd35..5ebf287fe700 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); |