Skip to content

Commit

Permalink
stallion: Prepare for BKL push down
Browse files Browse the repository at this point in the history
Remove broken softcar functions, wrap ioctl handler in BKL

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Apr 30, 2008
1 parent b190e17 commit f433c65
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions drivers/char/stallion.c
Original file line number Diff line number Diff line change
Expand Up @@ -1273,18 +1273,9 @@ static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd

rc = 0;

lock_kernel();

switch (cmd) {
case TIOCGSOFTCAR:
rc = put_user(((tty->termios->c_cflag & CLOCAL) ? 1 : 0),
(unsigned __user *) argp);
break;
case TIOCSSOFTCAR:
if (get_user(ival, (unsigned int __user *) arg))
return -EFAULT;
tty->termios->c_cflag =
(tty->termios->c_cflag & ~CLOCAL) |
(ival ? CLOCAL : 0);
break;
case TIOCGSERIAL:
rc = stl_getserial(portp, argp);
break;
Expand All @@ -1308,7 +1299,7 @@ static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd
rc = -ENOIOCTLCMD;
break;
}

unlock_kernel();
return rc;
}

Expand Down

0 comments on commit f433c65

Please sign in to comment.