diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-11 19:15:41 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-11 19:15:41 +0000 |
| commit | 5b4d4771e2a56671c7f1c94edda427a1e3d6f111 (patch) | |
| tree | 58718288a28cca121a94b681a7865473a10dfd64 /sound/usb/usbaudio.c | |
| parent | 55f78e1771f0886162edd441dd4f39c287779de2 (diff) | |
| parent | baadac8b10c5ac15ce3d26b68fa266c8889b163f (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound/usb/usbaudio.c')
| -rw-r--r-- | sound/usb/usbaudio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 675672f313b..f48838a078c 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c @@ -1762,6 +1762,8 @@ static int check_hw_params_convention(struct snd_usb_substream *subs) channels = kcalloc(MAX_MASK, sizeof(u32), GFP_KERNEL); rates = kcalloc(MAX_MASK, sizeof(u32), GFP_KERNEL); + if (!channels || !rates) + goto __out; list_for_each(p, &subs->fmt_list) { struct audioformat *f; |