Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[deliverable/linux.git] / drivers / usb / serial / oti6858.c

diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index 833ada47fc5429938af9045baa7e9fb68dda4b1a..d19861166b505cbca39a37f692d61fafd41cdf07 100644 (file)
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -817,21 +817,6 @@ static int oti6858_ioctl(struct usb_serial_port *port, struct file *file,
                                __FUNCTION__, port->number, cmd, arg);
 
        switch (cmd) {
-               case TCGETS:
-                       if (kernel_termios_to_user_termios((struct ktermios __user *)arg,
-                                                          port->tty->termios))
-                               return -EFAULT;
-                       return 0;
-
-               case TCSETS:
-               case TCSETSW:   /* FIXME: this is not the same! */
-               case TCSETSF:   /* FIXME: this is not the same! */
-                       if (user_termios_to_kernel_termios(port->tty->termios,
-                                               (struct ktermios __user *)arg))
-                               return -EFAULT;
-                       oti6858_set_termios(port, NULL);
-                       return 0;
-
                case TCFLSH:
                        /* FIXME */
                        return 0;
@@ -1159,7 +1144,7 @@ static struct pl2303_buf *pl2303_buf_alloc(unsigned int size)
        if (size == 0)
                return NULL;
 
-       pb = (struct pl2303_buf *)kmalloc(sizeof(struct pl2303_buf), GFP_KERNEL);
+       pb = kmalloc(sizeof(struct pl2303_buf), GFP_KERNEL);
        if (pb == NULL)
                return NULL;