USB: mos7840.c: turn this into a serial driver

[safe/jmp/linux-2.6] / drivers / usb / serial / funsoft.c

diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c
index d3be921..4092f6d 100644 (file)
--- a/drivers/usb/serial/funsoft.c
+++ b/drivers/usb/serial/funsoft.c
@@ -27,12 +27,12 @@ MODULE_DEVICE_TABLE(usb, id_table);
 static int funsoft_ioctl(struct usb_serial_port *port, struct file *file,
                         unsigned int cmd, unsigned long arg)
 {
-       struct termios t;
+       struct ktermios t;
 
        dbg("%s - port %d, cmd 0x%04x", __FUNCTION__, port->number, cmd);
 
        if (cmd == TCSETSF) {
-               if (user_termios_to_kernel_termios(&t, (void __user *)arg))
+               if (user_termios_to_kernel_termios(&t, (struct termios __user *)arg))
                        return -EFAULT;
 
                dbg("%s - iflag:%x oflag:%x cflag:%x lflag:%x", __FUNCTION__,
@@ -58,6 +58,7 @@ static struct usb_serial_driver funsoft_device = {
                .name =         "funsoft",
        },
        .id_table =             id_table,
+       .usb_driver =           &funsoft_driver,
        .num_interrupt_in =     NUM_DONT_CARE,
        .num_bulk_in =          NUM_DONT_CARE,
        .num_bulk_out =         NUM_DONT_CARE,