diff --git a/[refs] b/[refs] index a15d676a888d..e7ef7040172e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a532c69c37dbb46bfd0276160e624f06552adfc +refs/heads/master: 72109368de7aaa5d489d9ca4641f4a11a6fc7653 diff --git a/trunk/drivers/video/intelfb/intelfbdrv.c b/trunk/drivers/video/intelfb/intelfbdrv.c index 85bf55897f77..076fa56be192 100644 --- a/trunk/drivers/video/intelfb/intelfbdrv.c +++ b/trunk/drivers/video/intelfb/intelfbdrv.c @@ -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);