diff options
| author | Takashi Iwai <tiwai@suse.de> | 2007-12-17 16:24:04 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 17:29:37 +0100 |
| commit | f78dfac904325a996b8f97b045647898cc1ccc40 (patch) | |
| tree | da53f0ddb0768c17d75615184cb1741c4abedd6b | |
| parent | 48ecb7e879ea172a0b3fd432ad49a870d7be6a59 (diff) | |
| download | lwn-f78dfac904325a996b8f97b045647898cc1ccc40.tar.gz lwn-f78dfac904325a996b8f97b045647898cc1ccc40.zip | |
[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>
| -rw-r--r-- | sound/arm/pxa2xx-ac97.c | 1 | ||||
| -rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.c | 2 | ||||
| -rw-r--r-- | sound/ppc/snd_ps3.c | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 55c6c822bec1..d255503e7e07 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 de683b08fe03..5f5bbea8c39a 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 27b61899fe84..af812dc69ece 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; |