summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorMa Ling <ling.ma@intel.com>2009-03-11 11:18:29 +0100
committerEric Anholt <eric@anholt.net>2009-04-01 20:59:19 +0200
commit6b731a65c86119da808b3687e0bbb8f18ab137ad (patch)
tree6a60ff4f2e86f5a6220977b46d528b8dc3f2a30a /drivers/gpu
parentdrm/i915: check for -EINVAL from vm_insert_pfn (diff)
downloadlinux-6b731a65c86119da808b3687e0bbb8f18ab137ad.tar.xz
linux-6b731a65c86119da808b3687e0bbb8f18ab137ad.zip
drm/i915: avoid hanging on to a stale pointer to raw_edid.
drm_get_edid will store edid into raw_edid, so when freeing edid memory, at the same time clean raw_edid pointer. Signed-off-by: Ma Ling <ling.ma@intel.com> [anholt: Note that raw_edid is not currently used anywhere] Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/intel_modes.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
index e42019e5d661..07d7ec976168 100644
--- a/drivers/gpu/drm/i915/intel_modes.c
+++ b/drivers/gpu/drm/i915/intel_modes.c
@@ -76,6 +76,7 @@ int intel_ddc_get_modes(struct intel_output *intel_output)
drm_mode_connector_update_edid_property(&intel_output->base,
edid);
ret = drm_add_edid_modes(&intel_output->base, edid);
+ intel_output->base.display_info.raw_edid = NULL;
kfree(edid);
}