rpms/xorg-x11-drv-synaptics/F-11 synaptics-1.1.3-timer-fix.patch, NONE, 1.1 xorg-x11-drv-synaptics.spec, 1.35, 1.36

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31015

Modified Files:
	xorg-x11-drv-synaptics.spec 
Added Files:
	synaptics-1.1.3-timer-fix.patch 
Log Message:
* Wed Dec 09 2009 Adam Jackson <ajax at redhat.com> 1.1.3-2
- synaptics-1.1.3-timer-fix.patch: Don't free the timer in DeviceOff, since
  that happens on VT switch. (#540248)


synaptics-1.1.3-timer-fix.patch:
 synaptics.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE synaptics-1.1.3-timer-fix.patch ---
diff -up xf86-input-synaptics-1.1.3/src/synaptics.c.jx xf86-input-synaptics-1.1.3/src/synaptics.c
--- xf86-input-synaptics-1.1.3/src/synaptics.c.jx	2009-08-02 21:05:26.000000000 -0400
+++ xf86-input-synaptics-1.1.3/src/synaptics.c	2009-12-09 12:30:09.000000000 -0500
@@ -750,8 +750,7 @@ DeviceOff(DeviceIntPtr dev)
     DBG(3, ErrorF("Synaptics DeviceOff called\n"));
 
     if (local->fd != -1) {
-	TimerFree(priv->timer);
-	priv->timer = NULL;
+	TimerCancel(priv->timer);
 	xf86RemoveEnabledDevice(local);
 	priv->proto_ops->DeviceOffHook(local);
 	if (priv->comm.buffer) {
@@ -772,6 +771,7 @@ DeviceClose(DeviceIntPtr dev)
     SynapticsPrivate *priv = (SynapticsPrivate *) local->private;
 
     RetValue = DeviceOff(dev);
+    TimerFree(priv->timer);
     free_param_data(priv);
     return RetValue;
 }


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-11/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- xorg-x11-drv-synaptics.spec	3 Aug 2009 01:51:36 -0000	1.35
+++ xorg-x11-drv-synaptics.spec	9 Dec 2009 17:32:56 -0000	1.36
@@ -7,7 +7,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -18,6 +18,8 @@ Source0:        ftp://ftp.x.org/pub/indi
 Source1:        10-synaptics.fdi
 Source2:        make-git-snapshot.sh
 
+Patch0:		synaptics-1.1.3-timer-fix.patch
+
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
@@ -73,6 +75,7 @@ Features:
 %prep
 %setup -q -n %{tarball}-%{version}
 #%setup -q -n %{tarball}-%{gitdate}
+%patch0 -p1 -b .timer
 
 %build
 autoreconf -v --install --force || exit 1
@@ -121,6 +124,10 @@ Development files for the Synaptics Touc
 
 
 %changelog
+* Wed Dec 09 2009 Adam Jackson <ajax at redhat.com> 1.1.3-2
+- synaptics-1.1.3-timer-fix.patch: Don't free the timer in DeviceOff, since
+  that happens on VT switch. (#540248)
+
 * Mon Aug 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.3-1
 - synaptics 1.1.3
 - synaptics-1.1.2-auto-adjust-edges.patch: Drop.