X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=sound%2Fsparc%2Fcs4231.c;h=7d93fa705ccf493135b36cefff7ea242812ca11b;hb=6ac206c85233eb89533647f5fdc5ebe07320c5e5;hp=41c387587474c9ccaef6ae1c228ad1dffde14977;hpb=6b3bf2049180c4d4d6f4432f9148621410c179a9;p=linux-2.6-omap-h63xx.git

diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 41c38758747..7d93fa705cc 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -1563,6 +1563,7 @@ static int __init cs4231_attach_begin(struct snd_card **rcard)
 {
 	struct snd_card *card;
 	struct snd_cs4231 *chip;
+	int err;
 
 	*rcard = NULL;
 
@@ -1574,10 +1575,10 @@ static int __init cs4231_attach_begin(struct snd_card **rcard)
 		return -ENOENT;
 	}
 
-	card = snd_card_new(index[dev], id[dev], THIS_MODULE,
-			    sizeof(struct snd_cs4231));
-	if (card == NULL)
-		return -ENOMEM;
+	err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+			      sizeof(struct snd_cs4231), &card);
+	if (err < 0)
+		return err;
 
 	strcpy(card->driver, "CS4231");
 	strcpy(card->shortname, "Sun CS4231");