summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorMatthew Auld2016-08-23 17:00:44 +0200
committerJoonas Lahtinen2016-08-24 15:07:03 +0200
commitd1a3a036637aac0e473f602347f879afcf91236c (patch)
tree71c9ccc08dfc7e268a210ae77ce95825d7c3a205 /drivers/gpu/drm/i915/intel_display.c
parentdrm/i915/dvo: Remove dangling call to drm_encoder_cleanup() (diff)
downloadkernel-qcow2-linux-d1a3a036637aac0e473f602347f879afcf91236c.tar.gz
kernel-qcow2-linux-d1a3a036637aac0e473f602347f879afcf91236c.tar.xz
kernel-qcow2-linux-d1a3a036637aac0e473f602347f879afcf91236c.zip
drm/i915: free intel_fb
We need to free the allocated intel_fb in the error path, not intel_fb->base. Otherwise we risk calling kfree with a non-kmalloc'd address, which is bound to give us grief at some point. Signed-off-by: Matthew Auld <matthew.auld@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1471964444-24460-1-git-send-email-matthew.auld@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 6684099d49c6..fc953739af69 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9777,7 +9777,7 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc,
return;
error:
- kfree(fb);
+ kfree(intel_fb);
}
static void ironlake_get_pfit_config(struct intel_crtc *crtc,