Skip to content

Commit

Permalink
staging: dgrp: remove TIOCGSOFTCAR and TIOCSSOFTCAR handling
Browse files Browse the repository at this point in the history
The TIOCGSOFTCAR and TIOCSSOFTCAR ioctls are handled by the tty layer
so the dgrp driver shouldn't try to deal with them itself.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 15, 2012
1 parent 581a7dd commit 8fdefcb
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions drivers/staging/dgrp/dgrp_tty.c
Original file line number Diff line number Diff line change
Expand Up @@ -2615,21 +2615,6 @@ static int dgrp_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
*/
return 0;

case TIOCGSOFTCAR:
rc = access_ok(VERIFY_WRITE, (void __user *) arg,
sizeof(long));
if (rc == 0)
return -EFAULT;
put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *) arg);
return 0;

case TIOCSSOFTCAR:
get_user(arg, (unsigned long __user *) arg);
tty->termios.c_cflag =
((tty->termios.c_cflag & ~CLOCAL) |
(arg ? CLOCAL : 0));
return 0;

case TIOCMGET:
rc = access_ok(VERIFY_WRITE, (void __user *) arg,
sizeof(unsigned int));
Expand Down

0 comments on commit 8fdefcb

Please sign in to comment.