Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0064a1b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/cleanup' into for-linus 

* topic/cleanup:
  ALSA: info - Use krealloc()
parents b81e5ab3 9983aa62

sound/core/info.c

+1 −3
Original line number Diff line number Diff line
@@ -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;