patch-1.3.4 linux/drivers/char/scc.c

Next file: linux/drivers/char/selection.c
Previous file: linux/drivers/char/psaux.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.3/linux/drivers/char/scc.c linux/drivers/char/scc.c
@@ -1018,7 +1018,7 @@
 		if (scc2 == scc || !(scc2->tty && grp2)) 
 			return 0;
 		
-		if (grp1 & 0x3f == grp2 & 0x3f)
+		if ((grp1 & 0x3f) == (grp2 & 0x3f))
 		{
 			if ( (grp1 & TXGROUP) && (scc2->wreg[R5] & RTS) )
 				return 1;
@@ -1821,7 +1821,7 @@
 		
 		restore_flags(flags);
 			
-		put_fs_long(result,(unsigned long *) arg);
+		put_user(result,(unsigned int *) arg);
 		return 0;
 	case TIOCMBIS:
 	case TIOCMBIC:
@@ -1836,7 +1836,7 @@
 			scc->wreg[R5] &= ~RTS;
 			break;
 		case TIOCMSET:
-			value = get_fs_long((unsigned long *) arg);
+			value = get_user((unsigned int *) arg);
 			
 			if(value & TIOCM_DTR)
 				scc->wreg[R5] |= DTR;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this