Merge branch 'topic/cleanup' into for-linus

* topic/cleanup: ALSA: info - Use krealloc()
git-mirror · Sep 10, 2009 · d0064a1 · d0064a1
2 parents b81e5ab + 9983aa6
commit d0064a1
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/sound/core/info.c b/sound/core/info.c
@@ -88,12 +88,10 @@ static int resize_info_buffer(struct snd_info_buffer *buffer,
 	char *nbuf;
 
 	nsize = PAGE_ALIGN(nsize);
-	nbuf = kmalloc(nsize, GFP_KERNEL);
+	nbuf = krealloc(buffer->buffer, nsize, GFP_KERNEL);
 	if (! nbuf)
 		return -ENOMEM;
 
-	memcpy(nbuf, buffer->buffer, buffer->len);
-	kfree(buffer->buffer);
 	buffer->buffer = nbuf;
 	buffer->len = nsize;
 	return 0;