From 6652d561528ee0ec1a73aa2c703de67ad1906834 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 13 Mar 2013 12:01:13 +0100 Subject: [PATCH] --- yaml --- r: 371706 b: refs/heads/master c: 0d861ac23812428deae17de2038234b79818b964 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/core/info.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1f59ecf03941..859e3d46225a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb7c06e8e9c93b495e355421cffd3c43c266d7d2 +refs/heads/master: 0d861ac23812428deae17de2038234b79818b964 diff --git a/trunk/sound/core/info.c b/trunk/sound/core/info.c index db308dbc8911..58e97b35cceb 100644 --- a/trunk/sound/core/info.c +++ b/trunk/sound/core/info.c @@ -89,7 +89,7 @@ static int resize_info_buffer(struct snd_info_buffer *buffer, char *nbuf; nsize = PAGE_ALIGN(nsize); - nbuf = krealloc(buffer->buffer, nsize, GFP_KERNEL); + nbuf = krealloc(buffer->buffer, nsize, GFP_KERNEL | __GFP_ZERO); if (! nbuf) return -ENOMEM; @@ -353,7 +353,7 @@ static int snd_info_entry_open(struct inode *inode, struct file *file) goto __nomem; data->rbuffer = buffer; buffer->len = PAGE_SIZE; - buffer->buffer = kmalloc(buffer->len, GFP_KERNEL); + buffer->buffer = kzalloc(buffer->len, GFP_KERNEL); if (buffer->buffer == NULL) goto __nomem; }