From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 17 Dec 2007 15:24:04 +0000 (+0100)
Subject: [ALSA] Add missing device link
X-Git-Tag: v2.6.25-rc1~1127^2~181
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f78dfac904325a996b8f97b045647898cc1ccc40;p=linux-2.6-omap-h63xx.git

[ALSA] Add missing device link

Added the missing link to struct device from the card instance.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 55c6c822bec..d255503e7e0 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -352,6 +352,7 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
 	snprintf(card->longname, sizeof(card->longname),
 		 "%s (%s)", dev->dev.driver->name, card->mixername);
 
+	snd_card_set_dev(card, &dev->dev);
 	ret = snd_card_register(card);
 	if (ret == 0) {
 		platform_set_drvdata(dev, card);
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c
index de683b08fe0..5f5bbea8c39 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c
@@ -129,6 +129,8 @@ static int snd_pdacf_probe(struct pcmcia_device *link)
 		return -ENODEV;
 	}
 
+	snd_card_set_dev(card, &handle_to_dev(link));
+
 	pdacf->index = i;
 	card_list[i] = card;
 
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c
index 27b61899fe8..af812dc69ec 100644
--- a/sound/ppc/snd_ps3.c
+++ b/sound/ppc/snd_ps3.c
@@ -954,6 +954,7 @@ static int __init snd_ps3_driver_probe(struct ps3_system_bus_device *dev)
 	snd_ps3_init_avsetting(&the_card);
 
 	/* register the card */
+	snd_card_set_dev(the_card.card, &dev->core);
 	ret = snd_card_register(the_card.card);
 	if (ret < 0)
 		goto clean_dma_map;