rpms/xorg-x11-drv-evdev/F-12 evdev-2.3.2-reopen-infinity.patch, NONE, 1.1 xorg-x11-drv-evdev.spec, 1.70, 1.71

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27154

Modified Files:
	xorg-x11-drv-evdev.spec 
Added Files:
	evdev-2.3.2-reopen-infinity.patch 
Log Message:
* Fri Jan 08 2010 Peter Hutterer <peter.hutterer at redhat.com> 2.3.2-3
- evdev-2.3.2-reopen-infinity.patch: Don't reopen into infinity if
  ReopenAttempts is 0. (related #540584)


evdev-2.3.2-reopen-infinity.patch:
 evdev.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE evdev-2.3.2-reopen-infinity.patch ---
>From 4a077809a3e0fa1c3dc1764f5b3a3b9684a19a6b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri, 8 Jan 2010 13:23:44 +1000
Subject: [PATCH] Don't reopen to infinity if reopen attempts is 0

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/evdev.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 33e02ab..d9eb7ef 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -378,7 +378,7 @@ EvdevReopenTimer(OsTimerPtr timer, CARD32 time, pointer arg)
 
     pEvdev->reopen_left--;
 
-    if (!pEvdev->reopen_left)
+    if (pEvdev->reopen_left <= 0)
     {
         xf86Msg(X_ERROR, "%s: Failed to reopen device after %d attempts.\n",
                 pInfo->name, pEvdev->reopen_attempts);
-- 
1.6.6



Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-12/xorg-x11-drv-evdev.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- xorg-x11-drv-evdev.spec	5 Jan 2010 00:09:10 -0000	1.70
+++ xorg-x11-drv-evdev.spec	8 Jan 2010 04:02:58 -0000	1.71
@@ -7,7 +7,7 @@
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
 Version:    2.3.2
-Release:    2%{?dist}
+Release:    3%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -18,6 +18,8 @@ Source0:   ftp://ftp.x.org/pub/individua
 Source1:    make-git-snapshot.sh
 Source2:    commitid
 
+Patch1:     evdev-2.3.2-reopen-infinity.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: autoconf automake libtool
@@ -34,6 +36,8 @@ X.Org X11 evdev input driver.
 #%setup -q -n %{tarball}-%{gitdate}
 %setup -q -n %{tarball}-%{version}
 
+%patch1 -p1
+
 %build
 #autoreconf -v --install || exit 1
 %configure --disable-static
@@ -71,6 +75,10 @@ X.Org X11 evdev input driver development
 
 
 %changelog
+* Fri Jan 08 2010 Peter Hutterer <peter.hutterer at redhat.com> 2.3.2-3
+- evdev-2.3.2-reopen-infinity.patch: Don't reopen into infinity if
+  ReopenAttempts is 0. (related #540584)
+
 * Tue Jan 05 2010 Peter Hutterer <peter.hutterer at redhat.com> 2.3.2-2
 - Remove libxkbfile-devel BuildRequire.