From: Jean Delvare <khali@linux-fr.org>
To: Petr Vandrovec <vandrove@vc.cvut.cz>
Cc: linux-fbdev-devel@lists.sourceforge.net
Subject: [PATCH] matroxfb: Use kzalloc
Date: Sun, 31 Dec 2006 17:06:05 +0100 [thread overview]
Message-ID: <20061231170605.30fd7005.khali@linux-fr.org> (raw)
Use kzalloc instead of kmalloc+memset, twice.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
---
drivers/video/matrox/i2c-matroxfb.c | 4 +---
drivers/video/matrox/matroxfb_crtc2.c | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
--- linux-2.6.20-rc2.orig/drivers/video/matrox/i2c-matroxfb.c 2006-12-31 17:01:35.000000000 +0100
+++ linux-2.6.20-rc2/drivers/video/matrox/i2c-matroxfb.c 2006-12-31 17:03:01.000000000 +0100
@@ -146,7 +146,7 @@ static void* i2c_matroxfb_probe(struct m
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 m
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:
--- linux-2.6.20-rc2.orig/drivers/video/matrox/matroxfb_crtc2.c 2006-12-31 17:01:34.000000000 +0100
+++ linux-2.6.20-rc2/drivers/video/matrox/matroxfb_crtc2.c 2006-12-31 17:03:01.000000000 +0100
@@ -694,12 +694,11 @@ static void* matroxfb_crtc2_probe(struct
/* 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);
--
Jean Delvare
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
next reply other threads:[~2007-01-01 20:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-31 16:06 Jean Delvare [this message]
2007-02-06 20:19 ` [PATCH] matroxfb: Use kzalloc James Simmons
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061231170605.30fd7005.khali@linux-fr.org \
--to=khali@linux-fr.org \
--cc=linux-fbdev-devel@lists.sourceforge.net \
--cc=vandrove@vc.cvut.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).