---

yaml --- r: 257625 b: refs/heads/master c: 00ef961 h: refs/heads/master i: 257623: 5c30a53 v: v3
git-mirror · Jul 14, 2011 · 03eb251 · 03eb251
1 parent 9c461e8
commit 03eb251
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f5733b0c883158b13366ae34b5e4bd52a1ac346
+refs/heads/master: 00ef9610acf2a90b3e75096355b92ff34e7c8f74
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
@@ -4958,13 +4958,14 @@ void *snd_array_new(struct snd_array *array)
 	if (array->used >= array->alloced) {
 		int num = array->alloced + array->alloc_align;
 		int size = (num + 1) * array->elem_size;
+		int oldsize = array->alloced * array->elem_size;
 		void *nlist;
 		if (snd_BUG_ON(num >= 4096))
 			return NULL;
 		nlist = krealloc(array->list, size, GFP_KERNEL);
 		if (!nlist)
 			return NULL;
-		memset(nlist, 0, size - array->alloced * array->elem_size);
+		memset(nlist + oldsize, 0, size - oldsize);
 		array->list = nlist;
 		array->alloced = num;
 	}