summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-07-14 15:57:27 +0200
committerTakashi Iwai <tiwai@suse.de>2011-07-14 15:58:02 +0200
commit00ef9610acf2a90b3e75096355b92ff34e7c8f74 (patch)
tree8a6c3950a0c44bafa294650f06a13f78656e96bc
parent0f5733b0c883158b13366ae34b5e4bd52a1ac346 (diff)
downloadlinux-3.10-00ef9610acf2a90b3e75096355b92ff34e7c8f74.tar.gz
linux-3.10-00ef9610acf2a90b3e75096355b92ff34e7c8f74.tar.bz2
linux-3.10-00ef9610acf2a90b3e75096355b92ff34e7c8f74.zip
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 4afc6fcf0cd..f26e487eca1 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)
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;
}