stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9236a6d9722df7b18d780e74728dfcbfe485bd77
commit 9236a6d9722df7b18d780e74728dfcbfe485bd77 Author: Stefan Schmidt <[email protected]> Date: Thu Aug 14 15:57:27 2014 +0200 evas/drm: No need to check info.fd < 0 again as we just did that. We are in a block here which already checked fro that. Remove this and adjust indent. --- src/modules/evas/engines/drm/evas_engine.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/modules/evas/engines/drm/evas_engine.c b/src/modules/evas/engines/drm/evas_engine.c index 5bbe931..e54f131 100644 --- a/src/modules/evas/engines/drm/evas_engine.c +++ b/src/modules/evas/engines/drm/evas_engine.c @@ -39,15 +39,14 @@ _output_setup(Evas_Engine_Info_Drm *info, int w, int h) goto on_error; /* check if we already opened the drm device with ecore_evas */ - if (info->info.fd < 0) - { - /* try to open the drm ourselfs (most likely because we get called from expedite) */ - if (!ecore_drm_device_open(drm_dev)) - goto on_error; - info->info.own_fd = EINA_TRUE; - info->info.fd = ecore_drm_device_fd_get(drm_dev); - } - /* try to init drm (this includes openening tty) */ + /* try to open the drm ourselfs (most likely because we get called from expedite) */ + if (!ecore_drm_device_open(drm_dev)) + goto on_error; + + info->info.own_fd = EINA_TRUE; + info->info.fd = ecore_drm_device_fd_get(drm_dev); + + /* try to init drm (this includes openening tty) */ /* FIXME replace with ecore_drm_tty */ if (!evas_drm_init(info)) goto on_error; --
