diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:35 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:35 +0100 |
| commit | dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd (patch) | |
| tree | af1744c17c4bacad4c9524ad096d5a65f6c25c73 /sound/drivers/mpu401/mpu401.c | |
| parent | Linux 2.6.29 (diff) | |
| parent | ALSA: opti9xx - Fix build breakage by snd_card_create() conversion (diff) | |
| download | linux-dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd.tar.xz linux-dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd.zip | |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/drivers/mpu401/mpu401.c')
| -rw-r--r-- | sound/drivers/mpu401/mpu401.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c index 5b996f3faba5..149d05a8202d 100644 --- a/sound/drivers/mpu401/mpu401.c +++ b/sound/drivers/mpu401/mpu401.c @@ -73,9 +73,9 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard) snd_printk(KERN_ERR "the uart_enter option is obsolete; remove it\n"); *rcard = NULL; - card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); - if (card == NULL) - return -ENOMEM; + err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); + if (err < 0) + return err; strcpy(card->driver, "MPU-401 UART"); strcpy(card->shortname, card->driver); sprintf(card->longname, "%s at %#lx, ", card->shortname, port[dev]); |