diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-09-06 08:14:52 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-11 09:05:35 +0100 |
commit | b141ea4bd86bb08d0d27b87d8e54eac686c5fc75 (patch) | |
tree | 0c2d1d67e5007b0170e005ff969befa999fa0bff /meta/recipes-graphics/xorg-xserver/xserver-xorg | |
parent | 31a55b573484557925563a09ee08084d37180ff1 (diff) | |
download | poky-b141ea4bd86bb08d0d27b87d8e54eac686c5fc75.tar.gz |
xserver-xorg: config: fix NULL value detection for ID_INPUT being unset
Fixes Yocto # 12899
Xorg.log message:
(II) config/udev: Adding input device (unnamed) (/dev/tty59)
and cause system freezes.
(From OE-Core rev: e29a330e04baf0881805e4a36d28bafad7fcd318)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch new file mode 100644 index 0000000000..964d5dd4cf --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From a309323328d9d6e0bf5d9ea1d75920e53b9beef3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Hutterer <peter.hutterer@who-t.net> | ||
3 | Date: Fri, 5 Jan 2018 11:58:42 +1000 | ||
4 | Subject: [PATCH] config: fix NULL value detection for ID_INPUT being unset | ||
5 | |||
6 | Erroneous condition caused us to keep going with all devices that didn't have | ||
7 | ID_INPUT set. | ||
8 | |||
9 | Fixes: 5aad81445c8c3d6 | ||
10 | Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104382 | ||
11 | Reviewed-by: Adam Jackson <ajax@redhat.com> | ||
12 | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
13 | |||
14 | Upstream-status: Backport | ||
15 | https://patchwork.freedesktop.org/patch/196090/ | ||
16 | Affects: < 1.20.0 | ||
17 | [Yocto # 12899] | ||
18 | |||
19 | Signed-off-by: Armin Kuster <akuser808@gmail.com> | ||
20 | |||
21 | --- | ||
22 | config/udev.c | 2 +- | ||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/config/udev.c b/config/udev.c | ||
26 | index e198e8609..3a73189e2 100644 | ||
27 | --- a/config/udev.c | ||
28 | +++ b/config/udev.c | ||
29 | @@ -135,7 +135,7 @@ device_added(struct udev_device *udev_device) | ||
30 | #endif | ||
31 | |||
32 | value = udev_device_get_property_value(udev_device, "ID_INPUT"); | ||
33 | - if (value && !strcmp(value, "0")) { | ||
34 | + if (!value || !strcmp(value, "0")) { | ||
35 | LogMessageVerb(X_INFO, 10, | ||
36 | "config/udev: ignoring device %s without " | ||
37 | "property ID_INPUT set\n", path); | ||
38 | -- | ||
39 | 2.17.1 | ||
40 | |||