]> err.no Git - linux-2.6/commitdiff
[ALSA] Add missing device link
authorTakashi Iwai <tiwai@suse.de>
Mon, 17 Dec 2007 15:24:04 +0000 (16:24 +0100)
committerJaroslav Kysela <perex@perex.cz>
Thu, 31 Jan 2008 16:29:37 +0000 (17:29 +0100)
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>
sound/arm/pxa2xx-ac97.c
sound/pcmcia/pdaudiocf/pdaudiocf.c
sound/ppc/snd_ps3.c

index 55c6c822bec13eb82cb18a764b28678bf2c31558..d255503e7e077d155ff530a9016c38eb9b752670 100644 (file)
@@ -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);
index de683b08fe03af6b8b3527f292699f2ee9f12c5f..5f5bbea8c39a378a2a3469156f517ae348a2a89b 100644 (file)
@@ -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;
 
index 27b61899fe84d6cae6f86fbaa2923ba05343a596..af812dc69ece990ce032800b396b2476f6d80a4c 100644 (file)
@@ -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;