summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-09-06 08:14:52 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-11 09:05:35 +0100
commitb141ea4bd86bb08d0d27b87d8e54eac686c5fc75 (patch)
tree0c2d1d67e5007b0170e005ff969befa999fa0bff /meta
parent31a55b573484557925563a09ee08084d37180ff1 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch40
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb1
2 files changed, 41 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 @@
1From a309323328d9d6e0bf5d9ea1d75920e53b9beef3 Mon Sep 17 00:00:00 2001
2From: Peter Hutterer <peter.hutterer@who-t.net>
3Date: Fri, 5 Jan 2018 11:58:42 +1000
4Subject: [PATCH] config: fix NULL value detection for ID_INPUT being unset
5
6Erroneous condition caused us to keep going with all devices that didn't have
7ID_INPUT set.
8
9Fixes: 5aad81445c8c3d6
10Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104382
11Reviewed-by: Adam Jackson <ajax@redhat.com>
12Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
13
14Upstream-status: Backport
15https://patchwork.freedesktop.org/patch/196090/
16Affects: < 1.20.0
17[Yocto # 12899]
18
19Signed-off-by: Armin Kuster <akuser808@gmail.com>
20
21---
22 config/udev.c | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/config/udev.c b/config/udev.c
26index 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--
392.17.1
40
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
index c680cf9e89..7e8a9541cb 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
@@ -5,6 +5,7 @@ SRC_URI += "file://musl-arm-inb-outb.patch \
5 file://0003-modesetting-Fix-16-bit-depth-bpp-mode.patch \ 5 file://0003-modesetting-Fix-16-bit-depth-bpp-mode.patch \
6 file://0003-Remove-check-for-useSIGIO-option.patch \ 6 file://0003-Remove-check-for-useSIGIO-option.patch \
7 file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ 7 file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
8 file://0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch \
8 " 9 "
9SRC_URI[md5sum] = "3e47777ff034a331aed2322b078694a8" 10SRC_URI[md5sum] = "3e47777ff034a331aed2322b078694a8"
10SRC_URI[sha256sum] = "a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197" 11SRC_URI[sha256sum] = "a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197"