]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: dgcn: removes unnecessary commands in ioctl
authorLidza Louina <lidza.louina@gmail.com>
Tue, 13 Aug 2013 19:49:56 +0000 (15:49 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Aug 2013 21:06:13 +0000 (14:06 -0700)
The commands TIOCGETP, TCGETS, and TCGETA are not supposed to be seen by
the ioctl. This patch removes the switch cases for these commands.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/dgnc/dgnc_tty.c

index c174bf8063ebfc24a82ca8cb6b7e5eae79ebb77e..9dbe7bd0d2ff2937b549208c10960dfd966c18c8 100644 (file)
@@ -3336,40 +3336,6 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, struct file *file, unsigned in
                /* pretend we didn't recognize this IOCTL */  
                DGNC_UNLOCK(ch->ch_lock, lock_flags);
                return(-ENOIOCTLCMD);
-
-#ifdef TIOCGETP
-       case TIOCGETP:
-#endif
-       case TCGETS:
-       case TCGETA:
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
-               if (tty->ldisc->ops->ioctl) {
-#else
-               if (tty->ldisc.ops->ioctl) {
-#endif
-                       int retval = (-ENXIO);
-
-                       DGNC_UNLOCK(ch->ch_lock, lock_flags);
-
-                       if (tty->termios) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
-                               retval = ((tty->ldisc->ops->ioctl) (tty, file, cmd, arg));
-#else
-                               retval = ((tty->ldisc.ops->ioctl) (tty, file, cmd, arg));
-#endif
-                       }
-
-                       DPR_IOCTL(("dgnc_tty_ioctl (LINE:%d) finish on port %d - cmd %s (%x), arg %lx\n", 
-                               __LINE__, ch->ch_portnum, dgnc_ioctl_name(cmd), cmd, arg));
-                       return(retval);
-               }
-
-               DGNC_UNLOCK(ch->ch_lock, lock_flags);
-               DPR_IOCTL(("dgnc_tty_ioctl (LINE:%d) finish on port %d - cmd %s (%x), arg %lx\n", 
-                       __LINE__, ch->ch_portnum, dgnc_ioctl_name(cmd), cmd, arg));
-
-               return(-ENOIOCTLCMD);
-
        case TCSETSF:
        case TCSETSW:
                /*