diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-17 12:57:37 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-17 12:57:37 -0400 |
| commit | dbe36c9dd571e035078207862766963c4fc80262 (patch) | |
| tree | 090cd169e9b89c1c6f85dbaec7104c4df958fc5a /sound/drivers/mtpav.c | |
| parent | 2ebfb8eeb8f244f9d25937d31a947895cf819e26 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/drop-l3
Diffstat (limited to 'sound/drivers/mtpav.c')
| -rw-r--r-- | sound/drivers/mtpav.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c index 6b26305ff0e6..355da33cbd22 100644 --- a/sound/drivers/mtpav.c +++ b/sound/drivers/mtpav.c | |||
| @@ -698,9 +698,9 @@ static int __devinit snd_mtpav_probe(struct platform_device *dev) | |||
| 698 | int err; | 698 | int err; |
| 699 | struct mtpav *mtp_card; | 699 | struct mtpav *mtp_card; |
| 700 | 700 | ||
| 701 | card = snd_card_new(index, id, THIS_MODULE, sizeof(*mtp_card)); | 701 | err = snd_card_create(index, id, THIS_MODULE, sizeof(*mtp_card), &card); |
| 702 | if (! card) | 702 | if (err < 0) |
| 703 | return -ENOMEM; | 703 | return err; |
| 704 | 704 | ||
| 705 | mtp_card = card->private_data; | 705 | mtp_card = card->private_data; |
| 706 | spin_lock_init(&mtp_card->spinlock); | 706 | spin_lock_init(&mtp_card->spinlock); |