|
@@ -238,7 +238,6 @@ static int vxpocket_config(struct pcmcia_device *link)
|
|
goto failed;
|
|
goto failed;
|
|
|
|
|
|
chip->dev = &link->dev;
|
|
chip->dev = &link->dev;
|
|
- snd_card_set_dev(chip->card, chip->dev);
|
|
|
|
|
|
|
|
if (snd_vxpocket_assign_resources(chip, link->resource[0]->start,
|
|
if (snd_vxpocket_assign_resources(chip, link->resource[0]->start,
|
|
link->irq) < 0)
|
|
link->irq) < 0)
|
|
@@ -307,7 +306,8 @@ static int vxpocket_probe(struct pcmcia_device *p_dev)
|
|
return -ENODEV; /* disabled explicitly */
|
|
return -ENODEV; /* disabled explicitly */
|
|
|
|
|
|
/* ok, create a card instance */
|
|
/* ok, create a card instance */
|
|
- err = snd_card_create(index[i], id[i], THIS_MODULE, 0, &card);
|
|
|
|
|
|
+ err = snd_card_new(&p_dev->dev, index[i], id[i], THIS_MODULE,
|
|
|
|
+ 0, &card);
|
|
if (err < 0) {
|
|
if (err < 0) {
|
|
snd_printk(KERN_ERR "vxpocket: cannot create a card instance\n");
|
|
snd_printk(KERN_ERR "vxpocket: cannot create a card instance\n");
|
|
return err;
|
|
return err;
|