diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2014-09-04 21:43:45 +0100 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-19 14:41:12 +0200 |
| commit | 10e972d3f6dd77e009611c4bfeed02fa9827d0d6 (patch) | |
| tree | bdeda3f1d33e0890614f929f1a0a1878c76e865c /drivers/gpu/drm/i915/intel_dp.c | |
| parent | drm/i915: Limit the watermark to at least 8 entries on gen2/3 (diff) | |
| download | linux-dev-10e972d3f6dd77e009611c4bfeed02fa9827d0d6.tar.xz linux-dev-10e972d3f6dd77e009611c4bfeed02fa9827d0d6.zip | |
drm/i915/hdmi, dp: Do not dereference the encoder in the connector destroy
Oops, apparently intel_hdmi/intel_dp is the encoder - an object with a
distinct lifetime to the connector, and so we cannot simply reuse the
common function to unset and free the edid.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 2a26774ddb68..c973cd6bb4f5 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4395,7 +4395,7 @@ intel_dp_connector_destroy(struct drm_connector *connector) { struct intel_connector *intel_connector = to_intel_connector(connector); - intel_dp_unset_edid(intel_attached_dp(connector)); + kfree(intel_connector->detect_edid); if (!IS_ERR_OR_NULL(intel_connector->edid)) kfree(intel_connector->edid); |