diff options
Diffstat (limited to 'drivers/gpu/drm/bridge')
| -rw-r--r-- | drivers/gpu/drm/bridge/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/bridge/dumb-vga-dac.c | 4 | 
2 files changed, 4 insertions, 1 deletions
| diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index 3aa65bdecb0e..684ac626ac53 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -74,6 +74,7 @@ config DRM_SIL_SII8620  	tristate "Silicon Image SII8620 HDMI/MHL bridge"  	depends on OF && RC_CORE  	select DRM_KMS_HELPER +	imply EXTCON  	help  	  Silicon Image SII8620 HDMI/MHL bridge chip driver. diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c index 498d5948d1a8..9837c8d69e69 100644 --- a/drivers/gpu/drm/bridge/dumb-vga-dac.c +++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c @@ -56,7 +56,9 @@ static int dumb_vga_get_modes(struct drm_connector *connector)  	}  	drm_mode_connector_update_edid_property(connector, edid); -	return drm_add_edid_modes(connector, edid); +	ret = drm_add_edid_modes(connector, edid); +	kfree(edid); +	return ret;  fallback:  	/* |