Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fdefcb0 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

staging: dgrp: remove TIOCGSOFTCAR and TIOCSSOFTCAR handling 



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: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 581a7dde

drivers/staging/dgrp/dgrp_tty.c

+0 −15
Original line number Diff line number Diff line
@@ -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));