From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 16 Feb 2009 22:03:57 +0000 (+0100)
Subject: Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=96cf45cf559be375de29dd45afc50fa8946fb2aa;p=linux-beck.git

Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge
---

96cf45cf559be375de29dd45afc50fa8946fb2aa
diff --cc sound/isa/ad1816a/ad1816a.c
index 15f60107a11e,9660e598232c..bbcbf92a8ebe
--- a/sound/isa/ad1816a/ad1816a.c
+++ b/sound/isa/ad1816a/ad1816a.c
@@@ -156,11 -156,11 +156,12 @@@ static int __devinit snd_card_ad1816a_p
  	struct snd_card_ad1816a *acard;
  	struct snd_ad1816a *chip;
  	struct snd_opl3 *opl3;
 +	struct snd_timer *timer;
  
- 	if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
- 				 sizeof(struct snd_card_ad1816a))) == NULL)
- 		return -ENOMEM;
+ 	error = snd_card_create(index[dev], id[dev], THIS_MODULE,
+ 				sizeof(struct snd_card_ad1816a), &card);
+ 	if (error < 0)
+ 		return error;
  	acard = (struct snd_card_ad1816a *)card->private_data;
  
  	if ((error = snd_card_ad1816a_pnp(dev, acard, pcard, pid))) {