luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'topic/cleanup' into for-linus

Browse Source 
* topic/cleanup:
  ALSA: info - Use krealloc()
This commit is contained in:
Takashi Iwai 2009-09-10 15:32:43 +02:00
commit d0064a1b22
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/core/info.c
View File

@ -88,12 +88,10 @@ static int resize_info_buffer(struct snd_info_buffer *buffer,
char *nbuf; char *nbuf;
nsize = PAGE_ALIGN(nsize); nsize = PAGE_ALIGN(nsize);
nbuf = kmalloc(nsize, GFP_KERNEL); nbuf = krealloc(buffer->buffer, nsize, GFP_KERNEL);
if (! nbuf) if (! nbuf)
return -ENOMEM; return -ENOMEM;
memcpy(nbuf, buffer->buffer, buffer->len);
kfree(buffer->buffer);
buffer->buffer = nbuf; buffer->buffer = nbuf;
buffer->len = nsize; buffer->len = nsize;
return 0; return 0;