From 5ac8c4bbdbc0f3df03a5ca909dd83dfe84301b45 Mon Sep 17 00:00:00 2001
From: "Antonino A. Daplas" <adaplas@gmail.com>
Date: Mon, 9 Jan 2006 20:53:45 -0800
Subject: [PATCH] --- yaml --- r: 17663 b: refs/heads/master c:
 def1ededb7bfefc8678b4c7251622f7cbe65af94 h: refs/heads/master i:   17661:
 2e640b87f48bddf3421b7b50b9c024fa6f2fb2a9   17659:
 af0dd1f187dc15c21089cc73cf0435ec317fe4df   17655:
 ff82bf29c82849dce87160e33b993513b610714c   17647:
 0c936d27dd9ffd9b158c47592197074b6185d9f9   17631:
 7cfa14b6b28851e5c022656df0931f882031bed2   17599:
 7f16c620422012c04eb76452013678571988008b   17535:
 36583f9ca5e31a3f74fb345e56f3ef2d326930e2   17407:
 bd354ad2ecf8084b02b062002373b13966f0d560 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/video/fbcvt.c    | 3 +--
 trunk/drivers/video/fbmon.c    | 3 +--
 trunk/drivers/video/fbsysfs.c  | 5 +++--
 trunk/drivers/video/vgastate.c | 5 +++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 91e8dfaa8bc6..9b809be4a470 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a39bc34ea8f042e090ade124726ae5a3fd1a51f8
+refs/heads/master: def1ededb7bfefc8678b4c7251622f7cbe65af94
diff --git a/trunk/drivers/video/fbcvt.c b/trunk/drivers/video/fbcvt.c
index 0b6af00d197e..ac90883dc3aa 100644
--- a/trunk/drivers/video/fbcvt.c
+++ b/trunk/drivers/video/fbcvt.c
@@ -214,12 +214,11 @@ static void fb_cvt_print_name(struct fb_cvt_data *cvt)
 {
 	u32 pixcount, pixcount_mod;
 	int cnt = 255, offset = 0, read = 0;
-	u8 *buf = kmalloc(256, GFP_KERNEL);
+	u8 *buf = kzalloc(256, GFP_KERNEL);
 
 	if (!buf)
 		return;
 
-	memset(buf, 0, 256);
 	pixcount = (cvt->xres * (cvt->yres/cvt->interlace))/1000000;
 	pixcount_mod = (cvt->xres * (cvt->yres/cvt->interlace)) % 1000000;
 	pixcount_mod /= 1000;
diff --git a/trunk/drivers/video/fbmon.c b/trunk/drivers/video/fbmon.c
index 0ef75a9f84af..7c74e7325d95 100644
--- a/trunk/drivers/video/fbmon.c
+++ b/trunk/drivers/video/fbmon.c
@@ -528,10 +528,9 @@ static struct fb_videomode *fb_create_modedb(unsigned char *edid, int *dbsize)
 	unsigned char *block;
 	int num = 0, i;
 
-	mode = kmalloc(50 * sizeof(struct fb_videomode), GFP_KERNEL);
+	mode = kzalloc(50 * sizeof(struct fb_videomode), GFP_KERNEL);
 	if (mode == NULL)
 		return NULL;
-	memset(mode, 0, 50 * sizeof(struct fb_videomode));
 
 	if (edid == NULL || !edid_checksum(edid) || 
 	    !edid_check_header(edid)) {
diff --git a/trunk/drivers/video/fbsysfs.c b/trunk/drivers/video/fbsysfs.c
index 35147030a3e8..6d26057337e2 100644
--- a/trunk/drivers/video/fbsysfs.c
+++ b/trunk/drivers/video/fbsysfs.c
@@ -43,10 +43,11 @@ struct fb_info *framebuffer_alloc(size_t size, struct device *dev)
 	if (size)
 		fb_info_size += PADDING;
 
-	p = kmalloc(fb_info_size + size, GFP_KERNEL);
+	p = kzalloc(fb_info_size + size, GFP_KERNEL);
+
 	if (!p)
 		return NULL;
-	memset(p, 0, fb_info_size + size);
+
 	info = (struct fb_info *) p;
 
 	if (size)
diff --git a/trunk/drivers/video/vgastate.c b/trunk/drivers/video/vgastate.c
index d9e01daee630..15179ec62339 100644
--- a/trunk/drivers/video/vgastate.c
+++ b/trunk/drivers/video/vgastate.c
@@ -356,10 +356,11 @@ int save_vga(struct vgastate *state)
 {
 	struct regstate *saved;
 
-	saved = kmalloc(sizeof(struct regstate), GFP_KERNEL);
+	saved = kzalloc(sizeof(struct regstate), GFP_KERNEL);
+
 	if (saved == NULL)
 		return 1;
-	memset (saved, 0, sizeof(struct regstate));
+
 	state->vidstate = (void *)saved;
 		
 	if (state->flags & VGA_SAVE_CMAP) {