xserver/hw/kdrive/linux tslib.c,1.11,1.12

[Phil Blundell]

Committed by: pb

Update of /cvs/xserver/xserver/hw/kdrive/linux
In directory gabe:/tmp/cvs-serv15387/hw/kdrive/linux

Modified Files:
	tslib.c 
Log Message:
2004-12-01  Phil Blundell  <philb at gnu.org>

	Patch from Florian Boor <florian.boor at kernelconcepts.de>:
	* hw/kdrive/linux/tslib.c (TslibEnable): Check return value from
	ts_config.
	(TslibInit): Likewise.
				


Index: tslib.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/tslib.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- tslib.c	13 Nov 2004 18:03:16 -0000	1.11
+++ tslib.c	1 Dec 2004 19:43:29 -0000	1.12
@@ -146,7 +146,8 @@
     return -1; 			/* XXX Not sure what to return here */
   }
   
-  ts_config(tsDev); 
+  if (ts_config(tsDev))
+    return -1;
   fd=ts_fd(tsDev);
 
   return fd;
@@ -188,7 +189,7 @@
 	      /* XXX Should check for  */
 
 		if(!(tsDev = ts_open(TsNames[i],0))) continue;
-	        ts_config(tsDev); 
+	        if (ts_config(tsDev)) continue;
 	        fd=ts_fd(tsDev);
 		if (fd >= 0) 
 		{
@@ -200,7 +201,7 @@
 
 	  if(!(tsDev = ts_open(mi->name,0))) 
 	    continue;
-	  ts_config(tsDev); 
+	  if (ts_config(tsDev)) continue; 
 	  fd=ts_fd(tsDev);
 
 	}