Merge branch 'for-2.6.38' into for-2.6.39
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 @@
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 @@
/* 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;