From ad15ad5bfa92f02fb3be18e3c46d0893d865be55 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 1 Apr 2009 19:35:01 +0100
Subject: [PATCH] --- yaml --- r: 142697 b: refs/heads/master c:
 4ac5c61f0fc9b01946911a52d827f67947ab01a8 h: refs/heads/master i:   142695:
 8406ea1ecd72f5afe6051ca9f0d711be6ad33420 v: v3

---
 [refs]                     | 2 +-
 trunk/sound/soc/soc-core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2be96e0c7e02..0f063d8e61a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64ab9baa00fa99070da993f00173c35a8e99abfa
+refs/heads/master: 4ac5c61f0fc9b01946911a52d827f67947ab01a8
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index 6c62d4a54cdf..99712f652d0d 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -98,7 +98,7 @@ static int soc_ac97_dev_register(struct snd_soc_codec *codec)
 	int err;
 
 	codec->ac97->dev.bus = &ac97_bus_type;
-	codec->ac97->dev.parent = NULL;
+	codec->ac97->dev.parent = codec->card->dev;
 	codec->ac97->dev.release = soc_ac97_device_release;
 
 	dev_set_name(&codec->ac97->dev, "%d-%d:%s",