Merge tag 'v3.6-rc7' into drm-intel-next-queued

[karo-tx-linux.git] / drivers / staging / omapdrm / omap_connector.c

diff --git a/drivers/staging/omapdrm/omap_connector.c b/drivers/staging/omapdrm/omap_connector.c
index 55e9c865585058e9195e3eeef9aa8c554b57c886..38be186c249a8ed8e3fbed927ec6ed17633ea2f1 100644 (file)
--- a/drivers/staging/omapdrm/omap_connector.c
+++ b/drivers/staging/omapdrm/omap_connector.c
@@ -200,14 +200,11 @@ static int omap_connector_get_modes(struct drm_connector *connector)
                        drm_mode_connector_update_edid_property(
                                        connector, edid);
                        n = drm_add_edid_modes(connector, edid);
-                       kfree(connector->display_info.raw_edid);
-                       connector->display_info.raw_edid = edid;
                } else {
                        drm_mode_connector_update_edid_property(
                                        connector, NULL);
-                       connector->display_info.raw_edid = NULL;
-                       kfree(edid);
                }
+               kfree(edid);
        } else {
                struct drm_display_mode *mode = drm_mode_create(dev);
                struct omap_video_timings timings = {0};