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

Commit def1eded authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

[PATCH] fbdev: Replace kmalloc with kzalloc 



Replace kmalloc with kzalloc

Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a39bc34e

drivers/video/fbcvt.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -214,12 +214,11 @@ static void fb_cvt_print_name(struct fb_cvt_data *cvt) 
{

{

	u32 pixcount, pixcount_mod;

	u32 pixcount, pixcount_mod;

	int cnt = 255, offset = 0, read = 0;

	int cnt = 255, offset = 0, read = 0;

	u8 *buf = kmalloc(256, GFP_KERNEL);

	u8 *buf = kzalloc(256, GFP_KERNEL);





	if (!buf)

	if (!buf)

		return;

		return;





	memset(buf, 0, 256);

	pixcount = (cvt->xres * (cvt->yres/cvt->interlace))/1000000;

	pixcount = (cvt->xres * (cvt->yres/cvt->interlace))/1000000;

	pixcount_mod = (cvt->xres * (cvt->yres/cvt->interlace)) % 1000000;

	pixcount_mod = (cvt->xres * (cvt->yres/cvt->interlace)) % 1000000;

	pixcount_mod /= 1000;

	pixcount_mod /= 1000;

drivers/video/fbmon.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -528,10 +528,9 @@ static struct fb_videomode *fb_create_modedb(unsigned char *edid, int *dbsize) 
	unsigned char *block;

	unsigned char *block;

	int num = 0, i;

	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)

	if (mode == NULL)

		return NULL;

		return NULL;

	memset(mode, 0, 50 * sizeof(struct fb_videomode));





	if (edid == NULL || !edid_checksum(edid) || 

	if (edid == NULL || !edid_checksum(edid) || 

	    !edid_check_header(edid)) {

	    !edid_check_header(edid)) {

drivers/video/fbsysfs.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -43,10 +43,11 @@ struct fb_info *framebuffer_alloc(size_t size, struct device *dev) 
	if (size)

	if (size)

		fb_info_size += PADDING;

		fb_info_size += PADDING;





	p = kmalloc(fb_info_size + size, GFP_KERNEL);

	p = kzalloc(fb_info_size + size, GFP_KERNEL);



	if (!p)

	if (!p)

		return NULL;

		return NULL;

	memset(p, 0, fb_info_size + size);



	info = (struct fb_info *) p;

	info = (struct fb_info *) p;





	if (size)

	if (size)

drivers/video/vgastate.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -356,10 +356,11 @@ int save_vga(struct vgastate *state) 
{

{

	struct regstate *saved;

	struct regstate *saved;





	saved = kmalloc(sizeof(struct regstate), GFP_KERNEL);

	saved = kzalloc(sizeof(struct regstate), GFP_KERNEL);



	if (saved == NULL)

	if (saved == NULL)

		return 1;

		return 1;

	memset (saved, 0, sizeof(struct regstate));



	state->vidstate = (void *)saved;

	state->vidstate = (void *)saved;

		

		

	if (state->flags & VGA_SAVE_CMAP) {

	if (state->flags & VGA_SAVE_CMAP) {