From 3da434a4c71a2b1ad00ab7793322b9e157781c30 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 12 Jan 2009 15:17:09 +0100
Subject: [PATCH] --- yaml --- r: 132721 b: refs/heads/master c:
 758021bfa9ea25c58e62d2f68512628b19502ce7 h: refs/heads/master i:   132719:
 b86797243f8d464d1ff48914cfcb216f61029f34 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/media/video/cx88/cx88-alsa.c       | 7 ++++---
 trunk/drivers/media/video/em28xx/em28xx-audio.c  | 7 ++++---
 trunk/drivers/media/video/saa7134/saa7134-alsa.c | 8 ++++----
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 44938bbf3865..7f52adea2335 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fa51107c9aa80ae95b4524198442cdea82d08a3
+refs/heads/master: 758021bfa9ea25c58e62d2f68512628b19502ce7
diff --git a/trunk/drivers/media/video/cx88/cx88-alsa.c b/trunk/drivers/media/video/cx88/cx88-alsa.c
index 66c755c116dc..ce98d955231a 100644
--- a/trunk/drivers/media/video/cx88/cx88-alsa.c
+++ b/trunk/drivers/media/video/cx88/cx88-alsa.c
@@ -803,9 +803,10 @@ static int __devinit cx88_audio_initdev(struct pci_dev *pci,
 		return (-ENOENT);
 	}
 
-	card = snd_card_new(index[devno], id[devno], THIS_MODULE, sizeof(snd_cx88_card_t));
-	if (!card)
-		return (-ENOMEM);
+	err = snd_card_create(index[devno], id[devno], THIS_MODULE,
+			      sizeof(snd_cx88_card_t), &card);
+	if (err < 0)
+		return err;
 
 	card->private_free = snd_cx88_dev_free;
 
diff --git a/trunk/drivers/media/video/em28xx/em28xx-audio.c b/trunk/drivers/media/video/em28xx/em28xx-audio.c
index 94378ccb7505..66579508e175 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-audio.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-audio.c
@@ -438,9 +438,10 @@ static int em28xx_audio_init(struct em28xx *dev)
 	printk(KERN_INFO "em28xx-audio.c: Copyright (C) 2006 Markus "
 			 "Rechberger\n");
 
-	card = snd_card_new(index[devnr], "Em28xx Audio", THIS_MODULE, 0);
-	if (card == NULL)
-		return -ENOMEM;
+	err = snd_card_create(index[devnr], "Em28xx Audio", THIS_MODULE, 0,
+			      &card);
+	if (err < 0)
+		return err;
 
 	spin_lock_init(&adev->slock);
 	err = snd_pcm_new(card, "Em28xx Audio", 0, 0, 1, &pcm);
diff --git a/trunk/drivers/media/video/saa7134/saa7134-alsa.c b/trunk/drivers/media/video/saa7134/saa7134-alsa.c
index 26194a0ce927..482be1436e92 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-alsa.c
@@ -990,10 +990,10 @@ static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum)
 	if (!enable[devnum])
 		return -ENODEV;
 
-	card = snd_card_new(index[devnum], id[devnum], THIS_MODULE, sizeof(snd_card_saa7134_t));
-
-	if (card == NULL)
-		return -ENOMEM;
+	err = snd_card_create(index[devnum], id[devnum], THIS_MODULE,
+			      sizeof(snd_card_saa7134_t), &card);
+	if (err < 0)
+		return err;
 
 	strcpy(card->driver, "SAA7134");