The patch titled
matroxfb: Use kzalloc
has been added to the -mm tree. Its filename is
matroxfb-use-kzalloc.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: matroxfb: Use kzalloc
From: Jean Delvare <khali@xxxxxxxxxxxx>
Use kzalloc instead of kmalloc+memset, twice.
Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx>
Cc: Petr Vandrovec <vandrove@xxxxxxxxxx>
Acked-By: James Simmons <jsimmons@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/matrox/i2c-matroxfb.c | 4 +---
drivers/video/matrox/matroxfb_crtc2.c | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
diff -puN drivers/video/matrox/i2c-matroxfb.c~matroxfb-use-kzalloc drivers/video/matrox/i2c-matroxfb.c
--- a/drivers/video/matrox/i2c-matroxfb.c~matroxfb-use-kzalloc
+++ a/drivers/video/matrox/i2c-matroxfb.c
@@ -147,7 +147,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;
@@ -156,8 +156,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:
diff -puN drivers/video/matrox/matroxfb_crtc2.c~matroxfb-use-kzalloc drivers/video/matrox/matroxfb_crtc2.c
--- a/drivers/video/matrox/matroxfb_crtc2.c~matroxfb-use-kzalloc
+++ a/drivers/video/matrox/matroxfb_crtc2.c
@@ -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);
_
Patches currently in -mm which might be from khali@xxxxxxxxxxxx are
git-alsa.patch
matroxfb-use-kzalloc.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
