From 417f5d05c3a0a8f6419e8cbd2d1978876cdc79f1 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Wed, 15 Aug 2012 09:32:37 +0000 Subject: [PATCH] --- yaml --- r: 329307 b: refs/heads/master c: 993dcb05e47e357ade19c41f60b39085eeba8787 h: refs/heads/master i: 329305: 25cd2e986eb60aa064526ff48f3be66a6e621fae 329303: 09eee81637a763a83fcf34d370c2f62598146709 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/ast/ast_mode.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cbf3338a7cdd..07100cb19e2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bcd7235cead59ae4b98324c668c90b291beefcb1 +refs/heads/master: 993dcb05e47e357ade19c41f60b39085eeba8787 diff --git a/trunk/drivers/gpu/drm/ast/ast_mode.c b/trunk/drivers/gpu/drm/ast/ast_mode.c index 7282c081fb53..866e9d48b2d4 100644 --- a/trunk/drivers/gpu/drm/ast/ast_mode.c +++ b/trunk/drivers/gpu/drm/ast/ast_mode.c @@ -737,6 +737,7 @@ static int ast_get_modes(struct drm_connector *connector) if (edid) { drm_mode_connector_update_edid_property(&ast_connector->base, edid); ret = drm_add_edid_modes(connector, edid); + kfree(edid); return ret; } else drm_mode_connector_update_edid_property(&ast_connector->base, NULL);