diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-12-17 10:24:04 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:29:37 -0500 |
commit | f78dfac904325a996b8f97b045647898cc1ccc40 (patch) | |
tree | da53f0ddb0768c17d75615184cb1741c4abedd6b /sound | |
parent | 48ecb7e879ea172a0b3fd432ad49a870d7be6a59 (diff) |
[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>
Diffstat (limited to 'sound')
-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) | |||
352 | snprintf(card->longname, sizeof(card->longname), | 352 | snprintf(card->longname, sizeof(card->longname), |
353 | "%s (%s)", dev->dev.driver->name, card->mixername); | 353 | "%s (%s)", dev->dev.driver->name, card->mixername); |
354 | 354 | ||
355 | snd_card_set_dev(card, &dev->dev); | ||
355 | ret = snd_card_register(card); | 356 | ret = snd_card_register(card); |
356 | if (ret == 0) { | 357 | if (ret == 0) { |
357 | platform_set_drvdata(dev, card); | 358 | 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) | |||
129 | return -ENODEV; | 129 | return -ENODEV; |
130 | } | 130 | } |
131 | 131 | ||
132 | snd_card_set_dev(card, &handle_to_dev(link)); | ||
133 | |||
132 | pdacf->index = i; | 134 | pdacf->index = i; |
133 | card_list[i] = card; | 135 | card_list[i] = card; |
134 | 136 | ||
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) | |||
954 | snd_ps3_init_avsetting(&the_card); | 954 | snd_ps3_init_avsetting(&the_card); |
955 | 955 | ||
956 | /* register the card */ | 956 | /* register the card */ |
957 | snd_card_set_dev(the_card.card, &dev->core); | ||
957 | ret = snd_card_register(the_card.card); | 958 | ret = snd_card_register(the_card.card); |
958 | if (ret < 0) | 959 | if (ret < 0) |
959 | goto clean_dma_map; | 960 | goto clean_dma_map; |