aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2012-11-12 11:31:36 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-11-22 08:10:19 -0500
commit4b745b1e54efa5154a06ed606ad82660773602b3 (patch)
treeb7a932e3a40e294650107d94df0c6116895396c4 /drivers
parent662595df9fcba6e8d6f9ac905c960425cca38697 (diff)
drm/i915/sdvo: kfree the intel_sdvo_connector, not drm_connector, on destroy
Since the base fields in both struct intel_connector and struct intel_sdvo_connector are at the beginning of the enclosing struct, the pointers are essentially the same, but there is no requirement or guarantee that this is always the case. Kfree the enclosing intel_sdvo_connector pointer that was originally allocated, not the enclosed drm_connector, in case someone ever rearranges the structs. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_sdvo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index d85ebb0a83e9..a4bee83df745 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1832,7 +1832,7 @@ static void intel_sdvo_destroy(struct drm_connector *connector)
1832 intel_sdvo_destroy_enhance_property(connector); 1832 intel_sdvo_destroy_enhance_property(connector);
1833 drm_sysfs_connector_remove(connector); 1833 drm_sysfs_connector_remove(connector);
1834 drm_connector_cleanup(connector); 1834 drm_connector_cleanup(connector);
1835 kfree(connector); 1835 kfree(intel_sdvo_connector);
1836} 1836}
1837 1837
1838static bool intel_sdvo_detect_hdmi_audio(struct drm_connector *connector) 1838static bool intel_sdvo_detect_hdmi_audio(struct drm_connector *connector)