]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ASoC: Set parent for AC97 devices we register
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 1 Apr 2009 18:35:01 +0000 (19:35 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 2 Apr 2009 15:34:37 +0000 (16:34 +0100)
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>
sound/soc/soc-core.c

index 6c62d4a54cdf9f6c6d1781061adf140059e8347d..99712f652d0d4f42ba4e4ff49d772b2727debdaa 100644 (file)
@@ -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",