From eb1745529622f204733139bde2201eb4ee994c03 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 30 Apr 2008 00:53:21 -0700 Subject: riscom8: Prepare for BKL pushdown Push the locking down into a couple of functions that need it and remove bogus TIOCG/SSOFTCAR handling Signed-off-by: Alan Cox Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/char/riscom8.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'drivers/char/riscom8.c') diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c index 3f9d0a9ac36d..b56e0e04cb4a 100644 --- a/drivers/char/riscom8.c +++ b/drivers/char/riscom8.c @@ -1385,7 +1385,7 @@ static int rc_ioctl(struct tty_struct * tty, struct file * filp, { struct riscom_port *port = (struct riscom_port *)tty->driver_data; void __user *argp = (void __user *)arg; - int retval; + int retval = 0; if (rc_paranoia_check(port, tty->name, "rc_ioctl")) return -ENODEV; @@ -1406,23 +1406,20 @@ static int rc_ioctl(struct tty_struct * tty, struct file * filp, tty_wait_until_sent(tty, 0); rc_send_break(port, arg ? arg*(HZ/10) : HZ/4); break; - case TIOCGSOFTCAR: - return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned __user *)argp); - case TIOCSSOFTCAR: - if (get_user(arg,(unsigned __user *) argp)) - return -EFAULT; - tty->termios->c_cflag = - ((tty->termios->c_cflag & ~CLOCAL) | - (arg ? CLOCAL : 0)); + case TIOCGSERIAL: + lock_kernel(); + retval = rc_get_serial_info(port, argp); + unlock_kernel(); break; - case TIOCGSERIAL: - return rc_get_serial_info(port, argp); case TIOCSSERIAL: - return rc_set_serial_info(port, argp); + lock_kernel(); + retval = rc_set_serial_info(port, argp); + unlock_kernel(); + break; default: - return -ENOIOCTLCMD; + retval = -ENOIOCTLCMD; } - return 0; + return retval; } static void rc_throttle(struct tty_struct * tty) -- cgit v1.2.3