aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-09-10 09:32:43 -0400
committerTakashi Iwai <tiwai@suse.de>2009-09-10 09:32:43 -0400
commitd0064a1b22d0f60058902a870e6bf9aab0d8202c (patch)
treef14a4ff9aae8fd98b5df4790df469fcaf7d4ad05
parentb81e5ab34d960335c71ce33bf283ff5a22463a67 (diff)
parent9983aa62c321a22774e47cf701b6d8b16d92a822 (diff)
Merge branch 'topic/cleanup' into for-linus
* topic/cleanup: ALSA: info - Use krealloc()
-rw-r--r--sound/core/info.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/core/info.c b/sound/core/info.c
index 35df614f6c55..3d1f5137420a 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -88,12 +88,10 @@ static int resize_info_buffer(struct snd_info_buffer *buffer,
88 char *nbuf; 88 char *nbuf;
89 89
90 nsize = PAGE_ALIGN(nsize); 90 nsize = PAGE_ALIGN(nsize);
91 nbuf = kmalloc(nsize, GFP_KERNEL); 91 nbuf = krealloc(buffer->buffer, nsize, GFP_KERNEL);
92 if (! nbuf) 92 if (! nbuf)
93 return -ENOMEM; 93 return -ENOMEM;
94 94
95 memcpy(nbuf, buffer->buffer, buffer->len);
96 kfree(buffer->buffer);
97 buffer->buffer = nbuf; 95 buffer->buffer = nbuf;
98 buffer->len = nsize; 96 buffer->len = nsize;
99 return 0; 97 return 0;