linux-vax-kern-commit

[Dave A. <ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/block/paride
In directory sc8-pr-cvs1:/tmp/cvs-serv7538/drivers/block/paride

Modified Files:
	Config.in pf.c pg.c pseudo.h pt.c 
Log Message:
DA: sync with Marcelo 2.4.17


Index: Config.in
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/block/paride/Config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Config.in	11 Apr 2002 14:26:58 -0000	1.2
+++ Config.in	10 Jun 2003 01:13:25 -0000	1.3
@@ -29,7 +29,7 @@
 dep_tristate '    Shuttle EPAT/EPEZ protocol' CONFIG_PARIDE_EPAT $CONFIG_PARIDE
 if [ "$CONFIG_PARIDE_EPAT" != "n" ]; then
   if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-    bool '     Support c7/c8 chips (EXPERIMENTAL)' CONFIG_PARIDE_EPATC8 $CONFIG_PARIDE
+    bool '     Support c7/c8 chips (EXPERIMENTAL)' CONFIG_PARIDE_EPATC8
   fi
 fi
 

Index: pf.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/block/paride/pf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pf.c	11 Apr 2002 14:26:59 -0000	1.2
+++ pf.c	10 Jun 2003 01:13:26 -0000	1.3
@@ -733,7 +733,8 @@
 	for (k=0;k<len;k++) 
 	   if((buf[k+offs]!=0x20)||(buf[k+offs]!=l))
 		l=targ[j++]=buf[k+offs];
-	if (l==0x20) j--; targ[j]=0;
+	if (l==0x20) j--;
+	targ[j]=0;
 }
 
 static int xl( char *buf, int offs )

Index: pg.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/block/paride/pg.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pg.c	11 Apr 2002 14:26:59 -0000	1.2
+++ pg.c	10 Jun 2003 01:13:26 -0000	1.3
@@ -491,7 +491,8 @@
 	for (k=0;k<len;k++) 
 	   if((buf[k+offs]!=0x20)||(buf[k+offs]!=l))
 		l=targ[j++]=buf[k+offs];
-	if (l==0x20) j--; targ[j]=0;
+	if (l==0x20) j--;
+	targ[j]=0;
 }
 
 static int pg_identify( int unit, int log )

Index: pseudo.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/block/paride/pseudo.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- pseudo.h	25 Feb 2001 23:15:02 -0000	1.1.1.2
+++ pseudo.h	10 Jun 2003 01:13:26 -0000	1.2
@@ -102,7 +102,7 @@
 		spin_unlock_irqrestore(&ps_spinlock,flags);
 		return;
 	}
-        if (!ps_ready || ps_ready() || (jiffies >= ps_timeout)) {
+        if (!ps_ready || ps_ready() || time_after_eq(jiffies, ps_timeout)) {
                 ps_continuation = NULL;
         	spin_unlock_irqrestore(&ps_spinlock,flags);
                 con();
@@ -131,7 +131,7 @@
 	        spin_unlock_irqrestore(&ps_spinlock,flags);
 		return;
 	}
-        if (!ps_ready || ps_ready() || (jiffies >= ps_timeout)) {
+        if (!ps_ready || ps_ready() || time_after_eq(jiffies, ps_timeout)) {
                 ps_continuation = NULL;
 	        spin_unlock_irqrestore(&ps_spinlock,flags);
                 con();

Index: pt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/block/paride/pt.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pt.c	11 Apr 2002 14:26:59 -0000	1.2
+++ pt.c	10 Jun 2003 01:13:26 -0000	1.3
@@ -577,7 +577,8 @@
 	for (k=0;k<len;k++) 
 	   if((buf[k+offs]!=0x20)||(buf[k+offs]!=l))
 		l=targ[j++]=buf[k+offs];
-	if (l==0x20) j--; targ[j]=0;
+	if (l==0x20) j--;
+	targ[j]=0;
 }
 
 static int xn( char *buf, int offs, int size )