diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2013-10-01 11:38:54 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-10-09 09:55:29 +0400 |
| commit | 55e9edeb57ed9dd9be6773c5230187d701b14a46 (patch) | |
| tree | c7f49883825795af485457e80313122fb7012826 /drivers/gpu | |
| parent | 1eee814dfd509e7fdb28361303c9b0ac927ff4c1 (diff) | |
| download | linux-55e9edeb57ed9dd9be6773c5230187d701b14a46.tar.xz | |
drm/i915/dp: use drm_edid_duplicate
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 605908df95d8..3575b86ca799 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -2920,19 +2920,11 @@ intel_dp_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) /* use cached edid if we have one */ if (intel_connector->edid) { - struct edid *edid; - int size; - /* invalid edid */ if (IS_ERR(intel_connector->edid)) return NULL; - size = (intel_connector->edid->extensions + 1) * EDID_LENGTH; - edid = kmemdup(intel_connector->edid, size, GFP_KERNEL); - if (!edid) - return NULL; - - return edid; + return drm_edid_duplicate(intel_connector->edid); } return drm_get_edid(connector, adapter); |