Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 27484
b: refs/heads/master
c: 7210936
h: refs/heads/master
v: v3
  • Loading branch information
Dennis Munsie authored and Dave Airlie committed Jun 7, 2006
1 parent 1ea05d2 commit 1935200
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7a532c69c37dbb46bfd0276160e624f06552adfc
refs/heads/master: 72109368de7aaa5d489d9ca4641f4a11a6fc7653
4 changes: 2 additions & 2 deletions trunk/drivers/video/intelfb/intelfbdrv.c
Original file line number Diff line number Diff line change
Expand Up @@ -1036,10 +1036,10 @@ intelfb_init_var(struct intelfb_info *dinfo)
u8 *edid_d = NULL;

if (edid_s) {
edid_d = kmalloc(128, GFP_KERNEL);
edid_d = kmalloc(EDID_LENGTH, GFP_KERNEL);

if (edid_d) {
memcpy(edid_d, edid_s, 128);
memcpy(edid_d, edid_s, EDID_LENGTH);
fb_edid_to_monspecs(edid_d,
&dinfo->info->monspecs);
kfree(edid_d);
Expand Down

0 comments on commit 1935200

Please sign in to comment.