summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-02-12 21:13:05 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-02-12 21:21:47 +0100
commitf34762e98181558ac6283908e37107a8f0929d91 (patch)
treeff96eee2271cdae769c60a8131efa3329432ef49 /patches
parent84286dc1f9f8b1075ac771be3af00ea5e6a86c35 (diff)
downloadptxdist-f34762e98181558ac6283908e37107a8f0929d91.tar.gz
ptxdist-f34762e98181558ac6283908e37107a8f0929d91.tar.xz
tslib: add upstream patch to relax the EV_VERSION check
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/tslib-1.0/0001-Relax-EV_VERSION-check.patch30
-rw-r--r--patches/tslib-1.0/series1
2 files changed, 31 insertions, 0 deletions
diff --git a/patches/tslib-1.0/0001-Relax-EV_VERSION-check.patch b/patches/tslib-1.0/0001-Relax-EV_VERSION-check.patch
new file mode 100644
index 000000000..dc56abcc8
--- /dev/null
+++ b/patches/tslib-1.0/0001-Relax-EV_VERSION-check.patch
@@ -0,0 +1,30 @@
+From 412d99d8b92c12545f939972146a38c5074f3dcb Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Wed, 12 Jan 2011 14:36:35 +0100
+Subject: [PATCH] Relax EV_VERSION check
+
+Fail only if version of running kernel is lower than the EV_VERSION from the
+kernel headers, rather than expecting an exact match.
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+Signed-off-by: Chris Larson <chris_larson@mentor.com>
+---
+ plugins/input-raw.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/plugins/input-raw.c b/plugins/input-raw.c
+index 9511a0d..4396eab 100644
+--- a/plugins/input-raw.c
++++ b/plugins/input-raw.c
+@@ -78,7 +78,7 @@ static int check_fd(struct tslib_input *i)
+ return -1;
+ }
+
+- if (version != EV_VERSION) {
++ if (version < EV_VERSION) {
+ fprintf(stderr, "tslib: Selected device uses a different version of the event protocol than tslib was compiled for\n");
+ return -1;
+ }
+--
+1.7.2.3
+
diff --git a/patches/tslib-1.0/series b/patches/tslib-1.0/series
index 00c3b1a71..21ca6a673 100644
--- a/patches/tslib-1.0/series
+++ b/patches/tslib-1.0/series
@@ -16,3 +16,4 @@ r71-Fix-regularly-reported-absbit-keybit-copy-paste-bug.patch
r73-Prefix-correct-some-error-messages-in-input-raw-modu.patch
r75-Rely-on-SYN-Events-when-pen-is-lifted.patch
r78-input-raw-Handling-of-EVIOCGBIT-ioctl-coding.patch
+0001-Relax-EV_VERSION-check.patch