Commit 567d6f48 authored by Mark Brown's avatar Mark Brown

Merge branch 'for-2.6.38' into for-2.6.39

parents 13fd179f 0962bb21
...@@ -1518,6 +1518,7 @@ static int soc_post_component_init(struct snd_soc_card *card, ...@@ -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, ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment