|
@@ -209,10 +209,13 @@ int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid)
|
|
|
|
|
|
if (!edid && conn == 1) {
|
|
|
/* try to get from firmware */
|
|
|
- edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
|
|
|
- if (edid)
|
|
|
- memcpy(edid, fb_firmware_edid(info->device),
|
|
|
- EDID_LENGTH);
|
|
|
+ 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 (out_edid)
|