diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-19 04:22:14 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-19 04:22:14 -0500 |
| commit | a5e0e970c06065a14844b406a0c2a59776a1ccc6 (patch) | |
| tree | 1da3f4aac02e29f0dfbd099b17412011ca950cb8 /sound/drivers/mpu401/mpu401.c | |
| parent | 6ce6c473a7fd742fdb0db95841e2c4c6b37337c5 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/oxygen
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) | |||
| 73 | snd_printk(KERN_ERR "the uart_enter option is obsolete; remove it\n"); | 73 | snd_printk(KERN_ERR "the uart_enter option is obsolete; remove it\n"); |
| 74 | 74 | ||
| 75 | *rcard = NULL; | 75 | *rcard = NULL; |
| 76 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 76 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
| 77 | if (card == NULL) | 77 | if (err < 0) |
| 78 | return -ENOMEM; | 78 | return err; |
| 79 | strcpy(card->driver, "MPU-401 UART"); | 79 | strcpy(card->driver, "MPU-401 UART"); |
| 80 | strcpy(card->shortname, card->driver); | 80 | strcpy(card->shortname, card->driver); |
| 81 | sprintf(card->longname, "%s at %#lx, ", card->shortname, port[dev]); | 81 | sprintf(card->longname, "%s at %#lx, ", card->shortname, port[dev]); |