Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 05:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915/dp: use drm_edid_duplicate

Browse Source 
v2: duplicate intel_connector->edid, not uninitialized edid (Dave Airlie).

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Jani Nikula 2013-10-01 10:38:54 +03:00 committed by Dave Airlie
parent 1eee814dfd
commit 55e9edeb57
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i915/intel_dp.c
View File

@ -2920,19 +2920,11 @@ intel_dp_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)
/* use cached edid if we have one */ /* use cached edid if we have one */
if (intel_connector->edid) { if (intel_connector->edid) {
struct edid *edid;
int size;
/* invalid edid */ /* invalid edid */
if (IS_ERR(intel_connector->edid)) if (IS_ERR(intel_connector->edid))
return NULL; return NULL;
size = (intel_connector->edid->extensions + 1) * EDID_LENGTH; return drm_edid_duplicate(intel_connector->edid);
edid = kmemdup(intel_connector->edid, size, GFP_KERNEL);
if (!edid)
return NULL;
return edid;
} }
return drm_get_edid(connector, adapter); return drm_get_edid(connector, adapter);