hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-2.6.38' into for-2.6.39

This commit is contained in:
Mark Brown 2011-02-02 20:52:14 +00:00
parent 13fd179f14 0962bb217a
commit 567d6f4875
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/soc-core.c
View File

@ -1518,6 +1518,7 @@ static int soc_post_component_init(struct snd_soc_card *card,
rtd = &card->rtd_aux[num]; rtd = &card->rtd_aux[num];
name = aux_dev->name; name = aux_dev->name;
} }
rtd->card = card;
/* machine controls, routes and widgets are not prefixed */ /* machine controls, routes and widgets are not prefixed */
temp = codec->name_prefix; temp = codec->name_prefix;
@ -1539,7 +1540,6 @@ static int soc_post_component_init(struct snd_soc_card *card,
/* register the rtd device */ /* register the rtd device */
rtd->codec = codec; rtd->codec = codec;
rtd->card = card;
rtd->dev.parent = card->dev; rtd->dev.parent = card->dev;
rtd->dev.release = rtd_release; rtd->dev.release = rtd_release;
rtd->dev.init_name = name; rtd->dev.init_name = name;