aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/cx88/cx88-alsa.c7
-rw-r--r--drivers/media/video/em28xx/em28xx-audio.c7
-rw-r--r--drivers/media/video/saa7134/saa7134-alsa.c8
3 files changed, 12 insertions, 10 deletions
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index 66c755c116dc..ce98d955231a 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -803,9 +803,10 @@ static int __devinit cx88_audio_initdev(struct pci_dev *pci,
803 return (-ENOENT); 803 return (-ENOENT);
804 } 804 }
805 805
806 card = snd_card_new(index[devno], id[devno], THIS_MODULE, sizeof(snd_cx88_card_t)); 806 err = snd_card_create(index[devno], id[devno], THIS_MODULE,
807 if (!card) 807 sizeof(snd_cx88_card_t), &card);
808 return (-ENOMEM); 808 if (err < 0)
809 return err;
809 810
810 card->private_free = snd_cx88_dev_free; 811 card->private_free = snd_cx88_dev_free;
811 812
diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c
index 94378ccb7505..66579508e175 100644
--- a/drivers/media/video/em28xx/em28xx-audio.c
+++ b/drivers/media/video/em28xx/em28xx-audio.c
@@ -438,9 +438,10 @@ static int em28xx_audio_init(struct em28xx *dev)
438 printk(KERN_INFO "em28xx-audio.c: Copyright (C) 2006 Markus " 438 printk(KERN_INFO "em28xx-audio.c: Copyright (C) 2006 Markus "
439 "Rechberger\n"); 439 "Rechberger\n");
440 440
441 card = snd_card_new(index[devnr], "Em28xx Audio", THIS_MODULE, 0); 441 err = snd_card_create(index[devnr], "Em28xx Audio", THIS_MODULE, 0,
442 if (card == NULL) 442 &card);
443 return -ENOMEM; 443 if (err < 0)
444 return err;
444 445
445 spin_lock_init(&adev->slock); 446 spin_lock_init(&adev->slock);
446 err = snd_pcm_new(card, "Em28xx Audio", 0, 0, 1, &pcm); 447 err = snd_pcm_new(card, "Em28xx Audio", 0, 0, 1, &pcm);
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index 26194a0ce927..482be1436e92 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -990,10 +990,10 @@ static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum)
990 if (!enable[devnum]) 990 if (!enable[devnum])
991 return -ENODEV; 991 return -ENODEV;
992 992
993 card = snd_card_new(index[devnum], id[devnum], THIS_MODULE, sizeof(snd_card_saa7134_t)); 993 err = snd_card_create(index[devnum], id[devnum], THIS_MODULE,
994 994 sizeof(snd_card_saa7134_t), &card);
995 if (card == NULL) 995 if (err < 0)
996 return -ENOMEM; 996 return err;
997 997
998 strcpy(card->driver, "SAA7134"); 998 strcpy(card->driver, "SAA7134");
999 999