From 87049f91243f04f9b1eccc26fc074f6d8d221fff Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Tue, 15 Jul 2014 09:39:56 -0400 Subject: [PATCH] ecore-drm: When we destroy any evdev device, also close the associated fd. Signed-off-by: Chris Michael --- src/lib/ecore_drm/ecore_drm_evdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/ecore_drm/ecore_drm_evdev.c b/src/lib/ecore_drm/ecore_drm_evdev.c index 2e5ccac8e4..0f781a43f4 100644 --- a/src/lib/ecore_drm/ecore_drm_evdev.c +++ b/src/lib/ecore_drm/ecore_drm_evdev.c @@ -772,7 +772,7 @@ _ecore_drm_evdev_device_create(Ecore_Drm_Seat *seat, const char *path, int fd) edev->mt_slot = 0; if (ioctl(edev->fd, EVIOCGNAME(sizeof(name)), name) < 0) - DBG("Error getting device name: %m"); + ERR("Error getting device name: %m"); name[sizeof(name) - 1] = '\0'; edev->name = eina_stringshare_add(name); @@ -786,6 +786,7 @@ _ecore_drm_evdev_device_create(Ecore_Drm_Seat *seat, const char *path, int fd) if (!_device_configure(edev)) { + ERR("Could not configure input device"); _ecore_drm_evdev_device_destroy(edev); return NULL; } @@ -817,6 +818,8 @@ _ecore_drm_evdev_device_destroy(Ecore_Drm_Evdev *dev) if (dev->name) eina_stringshare_del(dev->name); if (dev->hdlr) ecore_main_fd_handler_del(dev->hdlr); + close(dev->fd); + free(dev); }