projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into upstream
[powerpc.git]
/
drivers
/
video
/
aty
/
radeon_monitor.c
diff --git
a/drivers/video/aty/radeon_monitor.c
b/drivers/video/aty/radeon_monitor.c
index
ea531a6
..
38c7dbf
100644
(file)
--- 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;
}