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/usb/usbaudio.c | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/usb/usbaudio.c')
| -rw-r--r-- | sound/usb/usbaudio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 19e37451c216..8f3cdb37a0ec 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
| @@ -3466,10 +3466,10 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx, | |||
| 3466 | return -ENXIO; | 3466 | return -ENXIO; |
| 3467 | } | 3467 | } |
| 3468 | 3468 | ||
| 3469 | card = snd_card_new(index[idx], id[idx], THIS_MODULE, 0); | 3469 | err = snd_card_create(index[idx], id[idx], THIS_MODULE, 0, &card); |
| 3470 | if (card == NULL) { | 3470 | if (err < 0) { |
| 3471 | snd_printk(KERN_ERR "cannot create card instance %d\n", idx); | 3471 | snd_printk(KERN_ERR "cannot create card instance %d\n", idx); |
| 3472 | return -ENOMEM; | 3472 | return err; |
| 3473 | } | 3473 | } |
| 3474 | 3474 | ||
| 3475 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); | 3475 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |