diff --git a/SOURCES/0001-eventcomm-if-we-get-a-read-error-other-than-EAGAIN-r.patch b/SOURCES/0001-eventcomm-if-we-get-a-read-error-other-than-EAGAIN-r.patch new file mode 100644 index 0000000..7205949 --- /dev/null +++ b/SOURCES/0001-eventcomm-if-we-get-a-read-error-other-than-EAGAIN-r.patch @@ -0,0 +1,34 @@ +From 9f3a6ac97e9d3f13cdfb38e54fbce92452025830 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 14 May 2018 09:49:00 +1000 +Subject: [PATCH synaptics] eventcomm: if we get a read error other than + EAGAIN, remove the fd + +Otherwise poll() keeps on triggering on our fd until udev gets around to +notifying the server that the device is in some state of deadness. Meanwhile, +the input thread is busy filling the log up with "Read error" messages. Great +way to test file systems and their capacity to handle out of space scenarios +but otherwise a bit pointless. Those FS developers should write their own +tests instead of relying on the synaptics driver! + +Signed-off-by: Peter Hutterer +Reviewed-by: Adam Jackson +--- + src/eventcomm.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/eventcomm.c b/src/eventcomm.c +index f65d532..3d0c5b0 100644 +--- a/src/eventcomm.c ++++ b/src/eventcomm.c +@@ -557,6 +557,7 @@ SynapticsReadEvent(InputInfoPtr pInfo, struct input_event *ev) + if (rc != -EAGAIN) { + LogMessageVerbSigSafe(X_ERROR, 0, "%s: Read error %d\n", pInfo->name, + errno); ++ xf86RemoveEnabledDevice(pInfo); + } else if (proto_data->read_flag == LIBEVDEV_READ_FLAG_SYNC) { + proto_data->read_flag = LIBEVDEV_READ_FLAG_NORMAL; + return SynapticsReadEvent(pInfo, ev); +-- +2.14.3 + diff --git a/SPECS/xorg-x11-drv-synaptics.spec b/SPECS/xorg-x11-drv-synaptics.spec index fbe2a8d..c64cf87 100644 --- a/SPECS/xorg-x11-drv-synaptics.spec +++ b/SPECS/xorg-x11-drv-synaptics.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-synaptics Summary: Xorg X11 Synaptics touchpad input driver Version: 1.9.0 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -23,6 +23,8 @@ Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar. Source3: 50-synaptics.conf Source4: 70-touchpad-quirks.rules +Patch01: 0001-eventcomm-if-we-get-a-read-error-other-than-EAGAIN-r.patch + ExcludeArch: s390 s390x BuildRequires: autoconf automake libtool pkgconfig @@ -80,6 +82,7 @@ Features: %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%patch01 -p1 %build autoreconf -v --install --force || exit 1 @@ -138,6 +141,9 @@ Development files for the Synaptics TouchPad for X.Org. %changelog +* Tue May 15 2018 Peter Hutterer 1.9.0-2 +- Fix infinite log spam in case of read errors (#1564624). + * Fri Jan 27 2017 Peter Hutterer 1.9.0-1 - synaptics 1.9.0 (#1401659)