patch-2.1.14 linux/drivers/isdn/isdn_tty.c
Next file: linux/drivers/net/3c509.c
Previous file: linux/drivers/char/tty_ioctl.c
Back to the patch index
Back to the overall index
- Lines: 40
- Date:
Sat Nov 30 10:48:34 1996
- Orig file:
v2.1.13/linux/drivers/isdn/isdn_tty.c
- Orig date:
Fri Nov 1 17:13:16 1996
diff -u --recursive --new-file v2.1.13/linux/drivers/isdn/isdn_tty.c linux/drivers/isdn/isdn_tty.c
@@ -1014,7 +1014,7 @@
status = info->lsr;
restore_flags(flags);
result = ((status & UART_LSR_TEMT) ? TIOCSER_TEMT : 0);
- return put_user(result, (ulong *) value);
+ return put_user(result, value);
}
@@ -1035,7 +1035,7 @@
| ((status & UART_MSR_RI) ? TIOCM_RNG : 0)
| ((status & UART_MSR_DSR) ? TIOCM_DSR : 0)
| ((status & UART_MSR_CTS) ? TIOCM_CTS : 0);
- return put_user(result, (ulong *) value);
+ return put_user(result, value);
}
static int isdn_tty_set_modem_info(modem_info * info, uint cmd, uint * value)
@@ -1144,17 +1144,14 @@
#ifdef ISDN_DEBUG_MODEM_IOCTL
printk(KERN_DEBUG "ttyI%d ioctl TIOCGSOFTCAR\n", info->line);
#endif
- error = put_user(C_CLOCAL(tty) ? 1 : 0, (ulong *) arg);
- if (error)
- return error;
- return 0;
+ return put_user(C_CLOCAL(tty) ? 1 : 0, (uint *) arg);
case TIOCSSOFTCAR:
#ifdef ISDN_DEBUG_MODEM_IOCTL
printk(KERN_DEBUG "ttyI%d ioctl TIOCSSOFTCAR\n", info->line);
#endif
- error = get_user(arg ,((ulong *) arg));
- if (error)
- return error;
+ error = get_user(arg ,((uint *) arg));
+ if (error)
+ return error;
tty->termios->c_cflag =
((tty->termios->c_cflag & ~CLOCAL) |
(arg ? CLOCAL : 0));
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov