Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[pandora-kernel.git] / drivers / gpu / drm / ast / ast_mode.c

diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index a6982b8..7fc9f72 100644 (file)
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -582,7 +582,6 @@ static const struct drm_crtc_helper_funcs ast_crtc_helper_funcs = {
        .mode_set_base = ast_crtc_mode_set_base,
        .disable = ast_crtc_disable,
        .load_lut = ast_crtc_load_lut,
-       .disable = ast_crtc_disable,
        .prepare = ast_crtc_prepare,
        .commit = ast_crtc_commit,
 
@@ -737,6 +736,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);