diff options
author | Takashi Iwai | 2009-03-17 17:57:37 +0100 |
---|---|---|
committer | Takashi Iwai | 2009-03-17 17:57:37 +0100 |
commit | dbe36c9dd571e035078207862766963c4fc80262 (patch) | |
tree | 090cd169e9b89c1c6f85dbaec7104c4df958fc5a /sound/drivers/mpu401/mpu401.c | |
parent | ALSA: Add missing KERN_* prefix to printk in other sound/* (diff) | |
parent | ALSA: opti9xx - Fix build breakage by snd_card_create() conversion (diff) | |
download | kernel-qcow2-linux-dbe36c9dd571e035078207862766963c4fc80262.tar.gz kernel-qcow2-linux-dbe36c9dd571e035078207862766963c4fc80262.tar.xz kernel-qcow2-linux-dbe36c9dd571e035078207862766963c4fc80262.zip |
Merge branch 'topic/snd_card_new-err' into topic/drop-l3
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]); |