aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_hdmi.c
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2012-08-15 05:32:39 -0400
committerDave Airlie <airlied@redhat.com>2012-08-23 19:37:36 -0400
commit451023dc32d4542c21b52ad1692e6e01cb75b099 (patch)
tree9380bd992f953d0a7403b3894bd1d946b6fbca91 /drivers/gpu/drm/i915/intel_hdmi.c
parent993dcb05e47e357ade19c41f60b39085eeba8787 (diff)
drm: remove the raw_edid field from struct drm_display_info
Neither the drm core nor any of the drivers really need the raw_edid field of struct drm_display_info for anything. Instead of being useful, it creates confusion about who is responsible for freeing the memory it points to and setting the field to NULL afterwards, leading to memory leaks and dangling pointers. Remove the raw_edid field, and fix drivers as necessary. Reported-by: Russell King <linux@arm.linux.org.uk> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Acked-by: Inki Dae <inki.dae@samsung.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
-rw-r--r--drivers/gpu/drm/i915/intel_hdmi.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index e4c37bb572e8..35a6ee7a8cca 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -737,7 +737,6 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
737 drm_detect_hdmi_monitor(edid); 737 drm_detect_hdmi_monitor(edid);
738 intel_hdmi->has_audio = drm_detect_monitor_audio(edid); 738 intel_hdmi->has_audio = drm_detect_monitor_audio(edid);
739 } 739 }
740 connector->display_info.raw_edid = NULL;
741 kfree(edid); 740 kfree(edid);
742 } 741 }
743 742
@@ -778,8 +777,6 @@ intel_hdmi_detect_audio(struct drm_connector *connector)
778 if (edid) { 777 if (edid) {
779 if (edid->input & DRM_EDID_INPUT_DIGITAL) 778 if (edid->input & DRM_EDID_INPUT_DIGITAL)
780 has_audio = drm_detect_monitor_audio(edid); 779 has_audio = drm_detect_monitor_audio(edid);
781
782 connector->display_info.raw_edid = NULL;
783 kfree(edid); 780 kfree(edid);
784 } 781 }
785 782