From fe64d3b60853c3fa4c086dfbde7ca99ae9d4929a Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Tue, 4 Mar 2008 15:25:11 -0800
Subject: [PATCH] --- yaml --- r: 87141 b: refs/heads/master c:
 ff17e953cb70e37ceb7b487113a0a37441052219 h: refs/heads/master i:   87139:
 007accd93746ad91ff5f686a55362ef5b27c2ce7 v: v3

---
 [refs]                     | 2 +-
 trunk/sound/usb/usbaudio.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2bddbff9e881..304b814a7b71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f6f06ee6ada13b0fb39c800f8567ff81d4e807d
+refs/heads/master: ff17e953cb70e37ceb7b487113a0a37441052219
diff --git a/trunk/sound/usb/usbaudio.c b/trunk/sound/usb/usbaudio.c
index 675672f313be..f48838a078cb 100644
--- a/trunk/sound/usb/usbaudio.c
+++ b/trunk/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;