summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2014-12-10 10:45:43 -0500
committerChris Michael <cp.michael@samsung.com>2014-12-10 12:01:59 -0500
commit68ede67850a0b7c61493e4f771f35a53f0c81e50 (patch)
treed176eb135160283fef942caec46938bf35d84219 /src
parent61d03472a417d2eb42f8713264d6b7553df8b7c5 (diff)
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 <cp.michael@samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/modules/ecore_evas/engines/drm/ecore_evas_drm.c4
1 files changed, 3 insertions, 1 deletions
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 f69d5b307a..b444d94051 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)
498 if (!ecore_drm_inputs_create(dev)) 498 if (!ecore_drm_inputs_create(dev))
499 { 499 {
500 ERR("Could not create inputs: %m"); 500 ERR("Could not create inputs: %m");
501 goto output_err; 501 goto input_err;
502 } 502 }
503 503
504 /* try to create outputs */ 504 /* try to create outputs */
@@ -513,6 +513,8 @@ _ecore_evas_drm_init(const char *device)
513 return _ecore_evas_init_count; 513 return _ecore_evas_init_count;
514 514
515output_err: 515output_err:
516 ecore_drm_inputs_destroy(dev);
517input_err:
516 ecore_drm_sprites_destroy(dev); 518 ecore_drm_sprites_destroy(dev);
517sprite_err: 519sprite_err:
518 ecore_drm_device_close(dev); 520 ecore_drm_device_close(dev);