From: Takashi Iwai Date: Wed, 13 Mar 2013 11:15:28 +0000 (+0100) Subject: ALSA: hda - Drop explicit memset() by reallocation with __GFP_ZERO X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5265fd9a9f512e0822955b0614bc4a5458defff9;p=openwrt%2Fstaging%2Fblogic.git ALSA: hda - Drop explicit memset() by reallocation with __GFP_ZERO Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 04b57383e8cb..ea061b6c14f9 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -5535,14 +5535,12 @@ 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); + nlist = krealloc(array->list, size, GFP_KERNEL | __GFP_ZERO); if (!nlist) return NULL; - memset(nlist + oldsize, 0, size - oldsize); array->list = nlist; array->alloced = num; }