diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-02 20:52:14 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-02 20:52:14 +0000 |
| commit | 567d6f48759a30f4578c88c2672a8c0b0394be4c (patch) | |
| tree | e48d07f315fae862a0bfa872d47ce6cb27079e15 /sound/soc/soc-core.c | |
| parent | 13fd179f14712cc89b5b3812673891b96e0ab3a2 (diff) | |
| parent | 0962bb217ac74c4b8fae34c5367ebc63131c962c (diff) | |
| download | op-kernel-dev-567d6f48759a30f4578c88c2672a8c0b0394be4c.zip op-kernel-dev-567d6f48759a30f4578c88c2672a8c0b0394be4c.tar.gz | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 0c789f9..64befac 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1518,6 +1518,7 @@ static int soc_post_component_init(struct snd_soc_card *card, rtd = &card->rtd_aux[num]; name = aux_dev->name; } + rtd->card = card; /* machine controls, routes and widgets are not prefixed */ temp = codec->name_prefix; @@ -1539,7 +1540,6 @@ static int soc_post_component_init(struct snd_soc_card *card, /* register the rtd device */ rtd->codec = codec; - rtd->card = card; rtd->dev.parent = card->dev; rtd->dev.release = rtd_release; rtd->dev.init_name = name; |
