diff options
Diffstat (limited to 'sound/pcmcia')
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.c | 5 | ||||
-rw-r--r-- | sound/pcmcia/vx/vxpocket.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index 8f489de5c4c6..56bda124cd4a 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c | |||
@@ -112,7 +112,8 @@ static int snd_pdacf_probe(struct pcmcia_device *link) | |||
112 | return -ENODEV; /* disabled explicitly */ | 112 | return -ENODEV; /* disabled explicitly */ |
113 | 113 | ||
114 | /* ok, create a card instance */ | 114 | /* ok, create a card instance */ |
115 | err = snd_card_create(index[i], id[i], THIS_MODULE, 0, &card); | 115 | err = snd_card_new(&link->dev, index[i], id[i], THIS_MODULE, |
116 | 0, &card); | ||
116 | if (err < 0) { | 117 | if (err < 0) { |
117 | snd_printk(KERN_ERR "pdacf: cannot create a card instance\n"); | 118 | snd_printk(KERN_ERR "pdacf: cannot create a card instance\n"); |
118 | return err; | 119 | return err; |
@@ -131,8 +132,6 @@ static int snd_pdacf_probe(struct pcmcia_device *link) | |||
131 | return err; | 132 | return err; |
132 | } | 133 | } |
133 | 134 | ||
134 | snd_card_set_dev(card, &link->dev); | ||
135 | |||
136 | pdacf->index = i; | 135 | pdacf->index = i; |
137 | card_list[i] = card; | 136 | card_list[i] = card; |
138 | 137 | ||
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index d4db7ecaa6bf..786e7e139c9e 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c | |||
@@ -238,7 +238,6 @@ static int vxpocket_config(struct pcmcia_device *link) | |||
238 | goto failed; | 238 | goto failed; |
239 | 239 | ||
240 | chip->dev = &link->dev; | 240 | chip->dev = &link->dev; |
241 | snd_card_set_dev(chip->card, chip->dev); | ||
242 | 241 | ||
243 | if (snd_vxpocket_assign_resources(chip, link->resource[0]->start, | 242 | if (snd_vxpocket_assign_resources(chip, link->resource[0]->start, |
244 | link->irq) < 0) | 243 | link->irq) < 0) |
@@ -307,7 +306,8 @@ static int vxpocket_probe(struct pcmcia_device *p_dev) | |||
307 | return -ENODEV; /* disabled explicitly */ | 306 | return -ENODEV; /* disabled explicitly */ |
308 | 307 | ||
309 | /* ok, create a card instance */ | 308 | /* ok, create a card instance */ |
310 | err = snd_card_create(index[i], id[i], THIS_MODULE, 0, &card); | 309 | err = snd_card_new(&p_dev->dev, index[i], id[i], THIS_MODULE, |
310 | 0, &card); | ||
311 | if (err < 0) { | 311 | if (err < 0) { |
312 | snd_printk(KERN_ERR "vxpocket: cannot create a card instance\n"); | 312 | snd_printk(KERN_ERR "vxpocket: cannot create a card instance\n"); |
313 | return err; | 313 | return err; |