diff options
| author | Jani Nikula | 2012-08-15 11:32:39 +0200 |
|---|---|---|
| committer | Dave Airlie | 2012-08-24 01:37:36 +0200 |
| commit | 451023dc32d4542c21b52ad1692e6e01cb75b099 (patch) | |
| tree | 9380bd992f953d0a7403b3894bd1d946b6fbca91 /drivers/staging/omapdrm | |
| parent | drm/ast: fix EDID memory leak (diff) | |
| download | kernel-qcow2-linux-451023dc32d4542c21b52ad1692e6e01cb75b099.tar.gz kernel-qcow2-linux-451023dc32d4542c21b52ad1692e6e01cb75b099.tar.xz kernel-qcow2-linux-451023dc32d4542c21b52ad1692e6e01cb75b099.zip | |
drm: remove the raw_edid field from struct drm_display_info
Neither the drm core nor any of the drivers really need the raw_edid field
of struct drm_display_info for anything. Instead of being useful, it
creates confusion about who is responsible for freeing the memory it points
to and setting the field to NULL afterwards, leading to memory leaks and
dangling pointers.
Remove the raw_edid field, and fix drivers as necessary.
Reported-by: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/staging/omapdrm')
| -rw-r--r-- | drivers/staging/omapdrm/omap_connector.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/omapdrm/omap_connector.c b/drivers/staging/omapdrm/omap_connector.c index 5e2856c0e0bb..9c2287b71d29 100644 --- a/drivers/staging/omapdrm/omap_connector.c +++ b/drivers/staging/omapdrm/omap_connector.c @@ -177,14 +177,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; |