summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2012-08-15 12:32:36 +0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-08-17 09:21:34 +0200
commit38ab8a2009e33ded06bf80d3a95da393d8d651d6 (patch)
tree96c42de3866632d844fc460433639b1c85aea3d1 /drivers/gpu
parentd9875690d9b89a866022ff49e3fcea892345ad92 (diff)
downloadlinux-stable-38ab8a2009e33ded06bf80d3a95da393d8d651d6.tar.gz
linux-stable-38ab8a2009e33ded06bf80d3a95da393d8d651d6.tar.bz2
linux-stable-38ab8a2009e33ded06bf80d3a95da393d8d651d6.zip
drm/i915: fix EDID memory leak in SDVO
The EDID returned by drm_get_edid() was never freed. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/intel_sdvo.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index d172e9873131..d81bb0bf2885 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1692,6 +1692,7 @@ static bool intel_sdvo_detect_hdmi_audio(struct drm_connector *connector)
edid = intel_sdvo_get_edid(connector);
if (edid != NULL && edid->input & DRM_EDID_INPUT_DIGITAL)
has_audio = drm_detect_monitor_audio(edid);
+ kfree(edid);
return has_audio;
}