rpms/xorg-x11-drv-synaptics/F-11 synaptics-1.1.0-allocate-timer-early.patch, NONE, 1.1 xorg-x11-drv-synaptics.spec, 1.27, 1.28

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-drv-synaptics.spec 
Added Files:
	synaptics-1.1.0-allocate-timer-early.patch 
Log Message:
* Wed Apr 15 2009 Adam Jackson <ajax at redhat.com> 1.1.0-3
- synaptics-1.1.0-allocate-timer-early.patch: Allocate the timer early so
  we don't try to malloc it within a sigio handler.


synaptics-1.1.0-allocate-timer-early.patch:

--- NEW FILE synaptics-1.1.0-allocate-timer-early.patch ---
diff -up xf86-input-synaptics-1.1.0/src/synaptics.c.jx xf86-input-synaptics-1.1.0/src/synaptics.c
--- xf86-input-synaptics-1.1.0/src/synaptics.c.jx	2009-03-04 20:46:01.000000000 -0500
+++ xf86-input-synaptics-1.1.0/src/synaptics.c	2009-04-15 17:43:29.000000000 -0400
@@ -511,9 +511,17 @@ SynapticsPreInit(InputDriverPtr drv, IDe
     if (!priv)
 	return NULL;
 
+    /* allocate now so we don't allocate in the signal handler */
+    priv->timer = TimerSet(NULL, 0, 0, NULL, NULL);
+    if (!priv->timer) {
+	xfree(priv);
+	return NULL;
+    }
+
     /* Allocate a new InputInfoRec and add it to the head xf86InputDevs. */
     local = xf86AllocateInput(drv, 0);
     if (!local) {
+	xfree(priv->timer);
 	xfree(priv);
 	return NULL;
     }
@@ -614,6 +622,7 @@ SynapticsPreInit(InputDriverPtr drv, IDe
     if (priv->comm.buffer)
 	XisbFree(priv->comm.buffer);
     free_param_data(priv);
+    xfree(priv->timer);
     xfree(priv);
     local->private = NULL;
     return local;
@@ -627,6 +636,7 @@ static void SynapticsUnInit(InputDriverP
                             InputInfoPtr   local,
                             int            flags)
 {
+    xfree(((SynapticsPrivate *)local->private)->timer);
     xfree(local->private);
     local->private = NULL;
     xf86DeleteInput(local, 0);


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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xorg-x11-drv-synaptics.spec	14 Apr 2009 03:33:17 -0000	1.27
+++ xorg-x11-drv-synaptics.spec	15 Apr 2009 21:47:07 -0000	1.28
@@ -7,7 +7,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -19,6 +19,7 @@
 Source2:        make-git-snapshot.sh
 
 Patch1:         synaptics-1.1.0-synclient-64.patch
+Patch2:		synaptics-1.1.0-allocate-timer-early.patch
 
 ExcludeArch:    s390 s390x
 
@@ -77,6 +78,7 @@
 #%setup -q -n %{tarball}-%{gitdate}
 
 %patch1 -p1
+%patch2 -p1
 
 %build
 autoreconf -v --install --force || exit 1
@@ -125,6 +127,10 @@
 
 
 %changelog
+* Wed Apr 15 2009 Adam Jackson <ajax at redhat.com> 1.1.0-3
+- synaptics-1.1.0-allocate-timer-early.patch: Allocate the timer early so
+  we don't try to malloc it within a sigio handler.
+
 * Tue Apr 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.0-2
 - synaptics-1.1.0-synclient-64.patch: fix 64-bit integer issues with
   synclient (#494766)