Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2fdbe5cf27aff997e348c5f01b424ad734bd1d25 Commit: 2fdbe5cf27aff997e348c5f01b424ad734bd1d25 Parent: c30660ead2dd6ced47ac6ad4c099fb9305263ffb Author: Jean Delvare <[EMAIL PROTECTED]> AuthorDate: Mon Feb 12 00:55:07 2007 -0800 Committer: Linus Torvalds <[EMAIL PROTECTED]> CommitDate: Mon Feb 12 09:48:42 2007 -0800
[PATCH] matroxfb: Use kzalloc Use kzalloc instead of kmalloc+memset, twice. Signed-off-by: Jean Delvare <[EMAIL PROTECTED]> Cc: Petr Vandrovec <[EMAIL PROTECTED]> Acked-By: James Simmons <[EMAIL PROTECTED]> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]> Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]> --- drivers/video/matrox/i2c-matroxfb.c | 4 +--- drivers/video/matrox/matroxfb_crtc2.c | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c index fe28848..f64c4a0 100644 --- a/drivers/video/matrox/i2c-matroxfb.c +++ b/drivers/video/matrox/i2c-matroxfb.c @@ -146,7 +146,7 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) { unsigned long flags; struct matroxfb_dh_maven_info* m2info; - m2info = kmalloc(sizeof(*m2info), GFP_KERNEL); + m2info = kzalloc(sizeof(*m2info), GFP_KERNEL); if (!m2info) return NULL; @@ -155,8 +155,6 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) { matroxfb_DAC_out(PMINFO DAC_XGENIOCTRL, 0x00); matroxfb_DAC_unlock_irqrestore(flags); - memset(m2info, 0, sizeof(*m2info)); - switch (ACCESS_FBINFO(chip)) { case MGA_2064: case MGA_2164: diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c index 2c98010..03ae55b 100644 --- a/drivers/video/matrox/matroxfb_crtc2.c +++ b/drivers/video/matrox/matroxfb_crtc2.c @@ -694,12 +694,11 @@ static void* matroxfb_crtc2_probe(struct matrox_fb_info* minfo) { /* hardware is CRTC2 incapable... */ if (!ACCESS_FBINFO(devflags.crtc2)) return NULL; - m2info = kmalloc(sizeof(*m2info), GFP_KERNEL); + m2info = kzalloc(sizeof(*m2info), GFP_KERNEL); if (!m2info) { printk(KERN_ERR "matroxfb_crtc2: Not enough memory for CRTC2 control structs\n"); return NULL; } - memset(m2info, 0, sizeof(*m2info)); m2info->primary_dev = MINFO; if (matroxfb_dh_registerfb(m2info)) { kfree(m2info); - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html