diff options
| author | Takashi Iwai <[email protected]> | 2011-02-24 10:05:01 +0100 |
|---|---|---|
| committer | Takashi Iwai <[email protected]> | 2011-02-24 10:05:01 +0100 |
| commit | 1aa924e21eec9dbb2c5fae90a71451a700db4414 (patch) | |
| tree | 27cc77862c7f7078c7339e2f9b4e52da12ad04c8 /sound/soc/soc-core.c | |
| parent | 786c51f9168cfd2d49250c6e5e60035cbb2fd5a1 (diff) | |
| parent | ebbd224c22a00dbbee95031a0d6d595460f6f2b3 (diff) | |
Merge branch 'fix/hda' into topic/hda
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 c4b60610beb0..c3f6f1e72790 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1449,6 +1449,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; @@ -1471,7 +1472,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; |