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

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>

6 files changed, 8 insertions, 19 deletions

diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c
index ea531a6f45d..38c7dbf8c15 100644
--- a/drivers/video/aty/radeon_monitor.c
+++ b/drivers/video/aty/radeon_monitor.c
@@ -104,10 +104,9 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
         if (pedid == NULL)
                 return mt;
 
-        tmp = (u8 *)kmalloc(EDID_LENGTH, GFP_KERNEL);
+        tmp = kmemdup(pedid, EDID_LENGTH, GFP_KERNEL);
         if (!tmp)
                 return mt;
-        memcpy(tmp, pedid, EDID_LENGTH);
         *out_EDID = tmp;
         return mt;
 }
diff --git a/drivers/video/i810/i810-i2c.c b/drivers/video/i810/i810-i2c.c
index b38d805db31..b952e4504ab 100644
--- a/drivers/video/i810/i810-i2c.c
+++ b/drivers/video/i810/i810-i2c.c
@@ -162,9 +162,7 @@ int i810_probe_i2c_connector(struct fb_info *info, u8 **out_edid, int conn)
 
                 if (e != NULL) {
                         DPRINTK("i810-i2c: Getting EDID from BIOS\n");
-                        edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
-                        if (edid)
-                                memcpy(edid, e, EDID_LENGTH);
+                        edid = kmemdup(e, EDID_LENGTH, GFP_KERNEL);
                 }
         }
 
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index 6f9de04193d..664fc5cf962 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -1058,10 +1058,9 @@ intelfb_init_var(struct intelfb_info *dinfo)
                 u8 *edid_d = NULL;
 
                 if (edid_s) {
-                        edid_d = kmalloc(EDID_LENGTH, GFP_KERNEL);
+                        edid_d = kmemdup(edid_s, EDID_LENGTH, GFP_KERNEL);
 
                         if (edid_d) {
-                                memcpy(edid_d, edid_s, EDID_LENGTH);
                                 fb_edid_to_monspecs(edid_d,
                                                     &dinfo->info->monspecs);
                                 kfree(edid_d);
diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
index 19eef3a0902..442e8532834 100644
--- a/drivers/video/nvidia/nv_i2c.c
+++ b/drivers/video/nvidia/nv_i2c.c
@@ -210,11 +210,8 @@ int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid)
                 /* try to get from firmware */
                 const u8 *e = fb_firmware_edid(info->device);
 
-                if (e != NULL) {
-                        edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
-                        if (edid)
-                                memcpy(edid, e, EDID_LENGTH);
-                }
+                if (e != NULL)
+                        edid = kmemdup(e, EDID_LENGTH, GFP_KERNEL);
         }
 
         *out_edid = edid;
diff --git a/drivers/video/nvidia/nv_of.c b/drivers/video/nvidia/nv_of.c
index d9af88c2b58..181875fe35c 100644
--- a/drivers/video/nvidia/nv_of.c
+++ b/drivers/video/nvidia/nv_of.c
@@ -72,10 +72,9 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
                 }
         }
         if (pedid) {
-                *out_edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
+                *out_edid = kmemdup(pedid, EDID_LENGTH, GFP_KERNEL);
                 if (*out_edid == NULL)
                         return -1;
-                memcpy(*out_edid, pedid, EDID_LENGTH);
                 printk(KERN_DEBUG "nvidiafb: Found OF EDID for head %d\n", conn);
                 return 0;
         }
diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c
index 3f94223b7f0..cef5bf591cd 100644
--- a/drivers/video/savage/savagefb-i2c.c
+++ b/drivers/video/savage/savagefb-i2c.c
@@ -227,11 +227,8 @@ int savagefb_probe_i2c_connector(struct fb_info *info, u8 **out_edid)
                 /* try to get from firmware */
                 const u8 *e = fb_firmware_edid(info->device);
 
-                if (e) {
-                        edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
-                        if (edid)
-                                memcpy(edid, e, EDID_LENGTH);
-                }
+                if (e)
+                        edid = kmemdup(e, EDID_LENGTH, GFP_KERNEL);
         }
 
         *out_edid = edid;