From: "Antonino A. Daplas" Replace kmalloc with kzalloc Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton --- drivers/video/fbcvt.c | 3 +-- drivers/video/fbmon.c | 3 +-- drivers/video/fbsysfs.c | 5 +++-- drivers/video/vgastate.c | 5 +++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff -puN drivers/video/fbcvt.c~fbdev-replace-kmalloc-with-kzalloc drivers/video/fbcvt.c --- devel/drivers/video/fbcvt.c~fbdev-replace-kmalloc-with-kzalloc 2006-01-03 20:00:18.000000000 -0800 +++ devel-akpm/drivers/video/fbcvt.c 2006-01-03 20:00:18.000000000 -0800 @@ -214,12 +214,11 @@ static void fb_cvt_print_name(struct fb_ { 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 -puN drivers/video/fbmon.c~fbdev-replace-kmalloc-with-kzalloc drivers/video/fbmon.c --- devel/drivers/video/fbmon.c~fbdev-replace-kmalloc-with-kzalloc 2006-01-03 20:00:18.000000000 -0800 +++ devel-akpm/drivers/video/fbmon.c 2006-01-03 20:00:18.000000000 -0800 @@ -528,10 +528,9 @@ static struct fb_videomode *fb_create_mo 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 -puN drivers/video/fbsysfs.c~fbdev-replace-kmalloc-with-kzalloc drivers/video/fbsysfs.c --- devel/drivers/video/fbsysfs.c~fbdev-replace-kmalloc-with-kzalloc 2006-01-03 20:00:18.000000000 -0800 +++ devel-akpm/drivers/video/fbsysfs.c 2006-01-03 20:00:18.000000000 -0800 @@ -43,10 +43,11 @@ struct fb_info *framebuffer_alloc(size_t 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 -puN drivers/video/vgastate.c~fbdev-replace-kmalloc-with-kzalloc drivers/video/vgastate.c --- devel/drivers/video/vgastate.c~fbdev-replace-kmalloc-with-kzalloc 2006-01-03 20:00:18.000000000 -0800 +++ devel-akpm/drivers/video/vgastate.c 2006-01-03 20:00:18.000000000 -0800 @@ -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) { _