xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'topic/snd_card_new-err' into for-linus

Browse Source
This commit is contained in:
Takashi Iwai
2009-03-24 00:35:35 +01:00
parent 8e0ee43bc2 b1a0aac05f
commit dec14f8c0e
111 changed files with 617 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sound/usb/usbaudio.c
View File

@@ -3466,10 +3466,10 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
return -ENXIO;
}
card = snd_card_new(index[idx], id[idx], THIS_MODULE, 0);
if (card == NULL) {
err = snd_card_create(index[idx], id[idx], THIS_MODULE, 0, &card);
if (err < 0) {
snd_printk(KERN_ERR "cannot create card instance %d\n", idx);
return -ENOMEM;
return err;
}
chip = kzalloc(sizeof(*chip), GFP_KERNEL);