diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-03 10:35:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-03 10:35:09 -0400 |
| commit | 484cad34dd667235565c14a40e2f5a8143184aaa (patch) | |
| tree | 70bb901671958960a64d7f383c902178b4b49558 /drivers/gpu/drm/i915/intel_modes.c | |
| parent | 95a38f34635bdf06089de763b4becbc957694977 (diff) | |
| parent | 67796bf7dc54c035fd97f2681a72e5d2bf2a234a (diff) | |
Merge branch 'dma-debug' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'drivers/gpu/drm/i915/intel_modes.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_modes.c | 1 |
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) | |||
| 76 | drm_mode_connector_update_edid_property(&intel_output->base, | 76 | drm_mode_connector_update_edid_property(&intel_output->base, |
| 77 | edid); | 77 | edid); |
| 78 | ret = drm_add_edid_modes(&intel_output->base, edid); | 78 | ret = drm_add_edid_modes(&intel_output->base, edid); |
| 79 | intel_output->base.display_info.raw_edid = NULL; | ||
| 79 | kfree(edid); | 80 | kfree(edid); |
| 80 | } | 81 | } |
| 81 | 82 | ||