aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-07-14 09:57:27 -0400
committerTakashi Iwai <tiwai@suse.de>2011-07-14 09:58:02 -0400
commit00ef9610acf2a90b3e75096355b92ff34e7c8f74 (patch)
tree8a6c3950a0c44bafa294650f06a13f78656e96bc
parent0f5733b0c883158b13366ae34b5e4bd52a1ac346 (diff)
ALSA: hda - Fix krealloc() replacement in hda_codec.c
It was obviously wrong, grr.... Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/hda_codec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 4afc6fcf0cd4..f26e487eca1c 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -4958,13 +4958,14 @@ void *snd_array_new(struct snd_array *array)
4958 if (array->used >= array->alloced) { 4958 if (array->used >= array->alloced) {
4959 int num = array->alloced + array->alloc_align; 4959 int num = array->alloced + array->alloc_align;
4960 int size = (num + 1) * array->elem_size; 4960 int size = (num + 1) * array->elem_size;
4961 int oldsize = array->alloced * array->elem_size;
4961 void *nlist; 4962 void *nlist;
4962 if (snd_BUG_ON(num >= 4096)) 4963 if (snd_BUG_ON(num >= 4096))
4963 return NULL; 4964 return NULL;
4964 nlist = krealloc(array->list, size, GFP_KERNEL); 4965 nlist = krealloc(array->list, size, GFP_KERNEL);
4965 if (!nlist) 4966 if (!nlist)
4966 return NULL; 4967 return NULL;
4967 memset(nlist, 0, size - array->alloced * array->elem_size); 4968 memset(nlist + oldsize, 0, size - oldsize);
4968 array->list = nlist; 4969 array->list = nlist;
4969 array->alloced = num; 4970 array->alloced = num;
4970 } 4971 }