git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
char
/
riscom8.c
diff --git
a/drivers/char/riscom8.c
b/drivers/char/riscom8.c
index
69108ce
..
c4b51d3
100644
(file)
--- a/
drivers/char/riscom8.c
+++ b/
drivers/char/riscom8.c
@@
-1131,7
+1131,7
@@
static void rc_close(struct tty_struct * tty, struct file * filp)
tty->ldisc.flush_buffer(tty);
tty->closing = 0;
port->event = 0;
tty->ldisc.flush_buffer(tty);
tty->closing = 0;
port->event = 0;
- port->tty =
NULL
;
+ port->tty =
0
;
if (port->blocked_open) {
if (port->close_delay) {
current->state = TASK_INTERRUPTIBLE;
if (port->blocked_open) {
if (port->close_delay) {
current->state = TASK_INTERRUPTIBLE;
@@
-1380,7
+1380,7
@@
static inline void rc_send_break(struct riscom_port * port, unsigned long length
}
static inline int rc_set_serial_info(struct riscom_port * port,
}
static inline int rc_set_serial_info(struct riscom_port * port,
- struct serial_struct
__user
* newinfo)
+ struct serial_struct * newinfo)
{
struct serial_struct tmp;
struct riscom_board *bp = port_Board(port);
{
struct serial_struct tmp;
struct riscom_board *bp = port_Board(port);
@@
-1427,7
+1427,7
@@
static inline int rc_set_serial_info(struct riscom_port * port,
}
static inline int rc_get_serial_info(struct riscom_port * port,
}
static inline int rc_get_serial_info(struct riscom_port * port,
- struct serial_struct
__user *
retinfo)
+ struct serial_struct
*
retinfo)
{
struct serial_struct tmp;
struct riscom_board *bp = port_Board(port);
{
struct serial_struct tmp;
struct riscom_board *bp = port_Board(port);
@@
-1450,7
+1450,6
@@
static int rc_ioctl(struct tty_struct * tty, struct file * filp,
{
struct riscom_port *port = (struct riscom_port *)tty->driver_data;
{
struct riscom_port *port = (struct riscom_port *)tty->driver_data;
- void __user *argp = (void __user *)arg;
int retval;
if (rc_paranoia_check(port, tty->name, "rc_ioctl"))
int retval;
if (rc_paranoia_check(port, tty->name, "rc_ioctl"))
@@
-1473,18
+1472,18
@@
static int rc_ioctl(struct tty_struct * tty, struct file * filp,
rc_send_break(port, arg ? arg*(HZ/10) : HZ/4);
break;
case TIOCGSOFTCAR:
rc_send_break(port, arg ? arg*(HZ/10) : HZ/4);
break;
case TIOCGSOFTCAR:
- return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned
__user *)argp
);
+ return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned
int *) arg
);
case TIOCSSOFTCAR:
case TIOCSSOFTCAR:
- if (get_user(arg,(unsigned
__user *) argp
))
+ if (get_user(arg,(unsigned
int *) arg
))
return -EFAULT;
tty->termios->c_cflag =
((tty->termios->c_cflag & ~CLOCAL) |
(arg ? CLOCAL : 0));
break;
case TIOCGSERIAL:
return -EFAULT;
tty->termios->c_cflag =
((tty->termios->c_cflag & ~CLOCAL) |
(arg ? CLOCAL : 0));
break;
case TIOCGSERIAL:
- return rc_get_serial_info(port,
argp
);
+ return rc_get_serial_info(port,
(struct serial_struct *) arg
);
case TIOCSSERIAL:
case TIOCSSERIAL:
- return rc_set_serial_info(port,
argp
);
+ return rc_set_serial_info(port,
(struct serial_struct *) arg
);
default:
return -ENOIOCTLCMD;
}
default:
return -ENOIOCTLCMD;
}
@@
-1608,7
+1607,7
@@
static void rc_hangup(struct tty_struct * tty)
port->event = 0;
port->count = 0;
port->flags &= ~ASYNC_NORMAL_ACTIVE;
port->event = 0;
port->count = 0;
port->flags &= ~ASYNC_NORMAL_ACTIVE;
- port->tty =
NULL
;
+ port->tty =
0
;
wake_up_interruptible(&port->open_wait);
}
wake_up_interruptible(&port->open_wait);
}