summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Chojnacki <marcinch7@gmail.com>2015-06-18 15:01:52 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-08-20 11:03:53 +0200
commitc0a3229313d6931a77e0c1e1c22e398c0312bf6f (patch)
tree80e82e8a1e738bb3b169fd2f67904291e8c9702f
parentframebuffer: disable vgacon on microblaze arch (diff)
downloadlinux-c0a3229313d6931a77e0c1e1c22e398c0312bf6f.tar.xz
linux-c0a3229313d6931a77e0c1e1c22e398c0312bf6f.zip
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: Marcin Chojnacki <marcinch7@gmail.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/video/fbdev/vfb.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/video/fbdev/vfb.c b/drivers/video/fbdev/vfb.c
index 70a897b1e458..b9c2f81fb6b9 100644
--- a/drivers/video/fbdev/vfb.c
+++ b/drivers/video/fbdev/vfb.c
@@ -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;