2 files changed, 3 insertions, 7 deletions

diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
index 19eef3a09023..442e85328341 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 d9af88c2b580..181875fe35c6 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;
         }