diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:35 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:35 -0400 |
| commit | dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd (patch) | |
| tree | af1744c17c4bacad4c9524ad096d5a65f6c25c73 /sound/drivers/mtpav.c | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into for-linus
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 48b64e6b2670..0e17d2b5ce19 100644 --- a/sound/drivers/mtpav.c +++ b/sound/drivers/mtpav.c | |||
| @@ -696,9 +696,9 @@ static int __devinit snd_mtpav_probe(struct platform_device *dev) | |||
| 696 | int err; | 696 | int err; |
| 697 | struct mtpav *mtp_card; | 697 | struct mtpav *mtp_card; |
| 698 | 698 | ||
| 699 | card = snd_card_new(index, id, THIS_MODULE, sizeof(*mtp_card)); | 699 | err = snd_card_create(index, id, THIS_MODULE, sizeof(*mtp_card), &card); |
| 700 | if (! card) | 700 | if (err < 0) |
| 701 | return -ENOMEM; | 701 | return err; |
| 702 | 702 | ||
| 703 | mtp_card = card->private_data; | 703 | mtp_card = card->private_data; |
| 704 | spin_lock_init(&mtp_card->spinlock); | 704 | spin_lock_init(&mtp_card->spinlock); |