Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] drivers/video/*: use kmemdup()

Browse source 
From: Eric Sesterhenn <snakebyte@gmx.de>

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Alexey Dobriyan 2006-12-08 02:40:46 -08:00 committed by Linus Torvalds
parent efc08a75d3
commit bfba7b3793
6 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/video/aty/radeon_monitor.c
View file

@ -104,10 +104,9 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
if (pedid == NULL) if (pedid == NULL)
return mt; return mt;
tmp = (u8 *)kmalloc(EDID_LENGTH, GFP_KERNEL); tmp = kmemdup(pedid, EDID_LENGTH, GFP_KERNEL);
if (!tmp) if (!tmp)
return mt; return mt;
memcpy(tmp, pedid, EDID_LENGTH);
*out_EDID = tmp; *out_EDID = tmp;
return mt; return mt;
} }

4
drivers/video/i810/i810-i2c.c
View file

@ -162,9 +162,7 @@ int i810_probe_i2c_connector(struct fb_info *info, u8 **out_edid, int conn)
if (e != NULL) { if (e != NULL) {
DPRINTK("i810-i2c: Getting EDID from BIOS\n"); DPRINTK("i810-i2c: Getting EDID from BIOS\n");
edid = kmalloc(EDID_LENGTH, GFP_KERNEL); edid = kmemdup(e, EDID_LENGTH, GFP_KERNEL);
if (edid)
memcpy(edid, e, EDID_LENGTH);
} }
} }

3
drivers/video/intelfb/intelfbdrv.c
View file

@ -1058,10 +1058,9 @@ intelfb_init_var(struct intelfb_info *dinfo)
u8 *edid_d = NULL; u8 *edid_d = NULL;
if (edid_s) { if (edid_s) {
edid_d = kmalloc(EDID_LENGTH, GFP_KERNEL); edid_d = kmemdup(edid_s, EDID_LENGTH, GFP_KERNEL);
if (edid_d) { if (edid_d) {
memcpy(edid_d, edid_s, EDID_LENGTH);
fb_edid_to_monspecs(edid_d, fb_edid_to_monspecs(edid_d,
&dinfo->info->monspecs); &dinfo->info->monspecs);
kfree(edid_d); kfree(edid_d);

7
drivers/video/nvidia/nv_i2c.c
View file

@ -210,11 +210,8 @@ int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid)
/* try to get from firmware */ /* try to get from firmware */
const u8 *e = fb_firmware_edid(info->device); const u8 *e = fb_firmware_edid(info->device);
if (e != NULL) { if (e != NULL)
edid = kmalloc(EDID_LENGTH, GFP_KERNEL); edid = kmemdup(e, EDID_LENGTH, GFP_KERNEL);
if (edid)
memcpy(edid, e, EDID_LENGTH);
}
} }
*out_edid = edid; *out_edid = edid;

3
drivers/video/nvidia/nv_of.c
View file

@ -72,10 +72,9 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
} }
} }
if (pedid) { if (pedid) {
*out_edid = kmalloc(EDID_LENGTH, GFP_KERNEL); *out_edid = kmemdup(pedid, EDID_LENGTH, GFP_KERNEL);
if (*out_edid == NULL) if (*out_edid == NULL)
return -1; return -1;
memcpy(*out_edid, pedid, EDID_LENGTH);
printk(KERN_DEBUG "nvidiafb: Found OF EDID for head %d\n", conn); printk(KERN_DEBUG "nvidiafb: Found OF EDID for head %d\n", conn);
return 0; return 0;
} }

7
drivers/video/savage/savagefb-i2c.c
View file

@ -227,11 +227,8 @@ int savagefb_probe_i2c_connector(struct fb_info *info, u8 **out_edid)
/* try to get from firmware */ /* try to get from firmware */
const u8 *e = fb_firmware_edid(info->device); const u8 *e = fb_firmware_edid(info->device);
if (e) { if (e)
edid = kmalloc(EDID_LENGTH, GFP_KERNEL); edid = kmemdup(e, EDID_LENGTH, GFP_KERNEL);
if (edid)
memcpy(edid, e, EDID_LENGTH);
}
} }
*out_edid = edid; *out_edid = edid;