Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337949
b: refs/heads/master
c: 8fdefcb
h: refs/heads/master
i:
  337947: c8fdb45
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 15, 2012
1 parent f2f9c42 commit 1cc00e0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 581a7ddec13d8f08b308c4764090bf57b0254f6f
refs/heads/master: 8fdefcb0ab74eff3273a6c3039c4e80ef5f56bdc
15 changes: 0 additions & 15 deletions trunk/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 1cc00e0

Please sign in to comment.