summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-04-01 19:35:01 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-04-02 16:34:37 +0100
commit4ac5c61f0fc9b01946911a52d827f67947ab01a8 (patch)
treecfe02e3647ff5e035c5c22f21ad2ba9577dc905b /sound
parent64ab9baa00fa99070da993f00173c35a8e99abfa (diff)
downloadop-kernel-dev-4ac5c61f0fc9b01946911a52d827f67947ab01a8.zip
op-kernel-dev-4ac5c61f0fc9b01946911a52d827f67947ab01a8.tar.gz
ASoC: Set parent for AC97 devices we register
Ensure that any AC97 devices that bind to the CODEC are below the ASoC device in the device tree so the suspend and resume code can figure out what order to handle them in. Reported-by: Russell King <linux@arm.linux.org.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6c62d4a..99712f6 100644
--- a/sound/soc/soc-core.c
+++ b/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",
OpenPOWER on IntegriCloud