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

Commit c0a32293 authored by Marcin Chojnacki's avatar Marcin Chojnacki Committed by Tomi Valkeinen
Browse files

fbdev: remove unnecessary memset in vfb 



In vfb_probe memory is allocated using rvmalloc which automatically
sets the allocated memory to zero. This patch removes the second
unnecessary memset in vfb_probe.

Signed-off-by: default avatarMarcin Chojnacki <marcinch7@gmail.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 48fd8ecf

drivers/video/fbdev/vfb.c

+8 −9
Original line number Diff line number Diff line
@@ -51,7 +51,14 @@ static void *rvmalloc(unsigned long size) 
	if (!mem)

		return NULL;



	memset(mem, 0, size); /* Clear the ram out, no junk to the user */

	/*

	 * VFB must clear memory to prevent kernel info

	 * leakage into userspace

	 * VGA-based drivers MUST NOT clear memory if

	 * they want to be able to take over vgacon

	 */



	memset(mem, 0, size);

	adr = (unsigned long) mem;

	while (size > 0) {

		SetPageReserved(vmalloc_to_page((void *)adr));
@@ -490,14 +497,6 @@ static int vfb_probe(struct platform_device *dev) 
	if (!(videomemory = rvmalloc(videomemorysize)))

		return retval;



	/*

	 * VFB must clear memory to prevent kernel info

	 * leakage into userspace

	 * VGA-based drivers MUST NOT clear memory if

	 * they want to be able to take over vgacon

	 */

	memset(videomemory, 0, videomemorysize);



	info = framebuffer_alloc(sizeof(u32) * 256, &dev->dev);

	if (!info)

		goto err;