drm/i915: Do not free the passed EDID in intel_connector_update_modes()

The caller, not intel_connector_update_modes(), should free the edid. This
improves the reusability of intel_connector_update_modes().

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index a720acc..5f7c414 100644 (file)
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -418,12 +418,16 @@ static int intel_crt_ddc_get_modes(struct drm_connector *connector,
                                struct i2c_adapter *adapter)
 {
        struct edid *edid;
+       int ret;
 
        edid = intel_crt_get_edid(connector, adapter);
        if (!edid)
                return 0;
 
-       return intel_connector_update_modes(connector, edid);
+       ret = intel_connector_update_modes(connector, edid);
+       kfree(edid);
+
+       return ret;
 }
 
 static bool intel_crt_detect_ddc(struct drm_connector *connector)

diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
index cabd84b..d49985f 100644 (file)
--- a/drivers/gpu/drm/i915/intel_modes.c
+++ b/drivers/gpu/drm/i915/intel_modes.c
@@ -45,7 +45,6 @@ int intel_connector_update_modes(struct drm_connector *connector,
        drm_mode_connector_update_edid_property(connector, edid);
        ret = drm_add_edid_modes(connector, edid);
        drm_edid_to_eld(connector, edid);
-       kfree(edid);
 
        return ret;
 }
@@ -61,12 +60,16 @@ int intel_ddc_get_modes(struct drm_connector *connector,
                        struct i2c_adapter *adapter)
 {
        struct edid *edid;
+       int ret;
 
        edid = drm_get_edid(connector, adapter);
        if (!edid)
                return 0;
 
-       return intel_connector_update_modes(connector, edid);
+       ret = intel_connector_update_modes(connector, edid);
+       kfree(edid);
+
+       return ret;
 }
 
 static const struct drm_prop_enum_list force_audio_names[] = {