---

yaml --- r: 87141 b: refs/heads/master c: ff17e95 h: refs/heads/master i: 87139: 007accd v: v3
git-mirror · Mar 10, 2008 · fe64d3b · fe64d3b
1 parent d9c0ef3
commit fe64d3b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;