devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=68ede67850a0b7c61493e4f771f35a53f0c81e50
commit 68ede67850a0b7c61493e4f771f35a53f0c81e50 Author: Chris Michael <[email protected]> Date: Wed Dec 10 10:45:43 2014 -0500 ecore-evas-drm: Fix up error handling Summary: Due to the change of order in creating outputs & inputs, we need an additional goto error for destroying inputs if output_create fails @fix Signed-off-by: Chris Michael <[email protected]> --- src/modules/ecore_evas/engines/drm/ecore_evas_drm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c index f69d5b3..b444d94 100644 --- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c +++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c @@ -498,7 +498,7 @@ _ecore_evas_drm_init(const char *device) if (!ecore_drm_inputs_create(dev)) { ERR("Could not create inputs: %m"); - goto output_err; + goto input_err; } /* try to create outputs */ @@ -513,6 +513,8 @@ _ecore_evas_drm_init(const char *device) return _ecore_evas_init_count; output_err: + ecore_drm_inputs_destroy(dev); +input_err: ecore_drm_sprites_destroy(dev); sprite_err: ecore_drm_device_close(dev); --
