summaryrefslogtreecommitdiff
path: root/src/lib/ecore_drm2
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2018-01-22 11:26:13 -0500
committerChris Michael <cp.michael@samsung.com>2018-01-22 11:26:13 -0500
commitd1a7dd5e428174b5c1fa31880479a3f5722ad99d (patch)
tree656c3900b44c166cf51e8a34bd146462d6ae9321 /src/lib/ecore_drm2
parent4e2406ed3b624463fbeec37d3a935df951bef703 (diff)
ecore_drm2: fix seat matching when checking for a device with a null seat
Summary: Check to make sure that the seat from the matching device is still null. Test Plan: Make sure that devices are not being rejected while on seat1. This depends on another patch Reviewers: ManMower, devilhorns Reviewed By: devilhorns Subscribers: ManMower, devilhorns, cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5711
Diffstat (limited to 'src/lib/ecore_drm2')
-rw-r--r--src/lib/ecore_drm2/ecore_drm2_device.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ecore_drm2/ecore_drm2_device.c b/src/lib/ecore_drm2/ecore_drm2_device.c
index e04f0d38d8..f5059f5e68 100644
--- a/src/lib/ecore_drm2/ecore_drm2_device.c
+++ b/src/lib/ecore_drm2/ecore_drm2_device.c
@@ -100,6 +100,8 @@ _drm2_device_find(Elput_Manager *em, const char *seat)
100 Eina_Bool modeset; 100 Eina_Bool modeset;
101 int fd; 101 int fd;
102 102
103 EINA_SAFETY_ON_NULL_RETURN_VAL(seat, NULL);
104
103 devs = eeze_udev_find_by_subsystem_sysname("drm", "card[0-9]*"); 105 devs = eeze_udev_find_by_subsystem_sysname("drm", "card[0-9]*");
104 if (!devs) return NULL; 106 if (!devs) return NULL;
105 107
@@ -113,9 +115,7 @@ _drm2_device_find(Elput_Manager *em, const char *seat)
113 dseat = eeze_udev_syspath_get_property(dev, "ID_SEAT"); 115 dseat = eeze_udev_syspath_get_property(dev, "ID_SEAT");
114 if (!dseat) dseat = eina_stringshare_add("seat0"); 116 if (!dseat) dseat = eina_stringshare_add("seat0");
115 117
116 if ((seat) && (strcmp(seat, dseat))) 118 if (strcmp(seat, dseat))
117 goto cont;
118 else if (strcmp(dseat, "seat0"))
119 goto cont; 119 goto cont;
120 120
121 fd = elput_manager_open(em, dpath, -1); 121 fd = elput_manager_open(em, dpath, -1);