Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / usb / serial / empeg.c

diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index 251a50f..63f7c78 100644 (file)
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -81,7 +81,6 @@ static int debug;
 static int  empeg_open                 (struct usb_serial_port *port, struct file *filp);
 static void empeg_close                        (struct usb_serial_port *port, struct file *filp);
 static int  empeg_write                        (struct usb_serial_port *port,
-                                       int from_user,
                                        const unsigned char *buf,
                                        int count);
 static int  empeg_write_room           (struct usb_serial_port *port);
@@ -106,16 +105,18 @@ static struct usb_device_id id_table [] = {
 MODULE_DEVICE_TABLE (usb, id_table);
 
 static struct usb_driver empeg_driver = {
-       .owner =        THIS_MODULE,
        .name =         "empeg",
        .probe =        usb_serial_probe,
        .disconnect =   usb_serial_disconnect,
        .id_table =     id_table,
+       .no_dynamic_id =        1,
 };
 
-static struct usb_serial_device_type empeg_device = {
-       .owner =                THIS_MODULE,
-       .name =                 "Empeg",
+static struct usb_serial_driver empeg_device = {
+       .driver = {
+               .owner =        THIS_MODULE,
+               .name =         "empeg",
+       },
        .id_table =             id_table,
        .num_interrupt_in =     0,
        .num_bulk_in =          1,
@@ -185,13 +186,13 @@ static void empeg_close (struct usb_serial_port *port, struct file * filp)
        dbg("%s - port %d", __FUNCTION__, port->number);
 
        /* shutdown our bulk read */
-       usb_unlink_urb (port->read_urb);
+       usb_kill_urb(port->read_urb);
        /* Uncomment the following line if you want to see some statistics in your syslog */
        /* dev_info (&port->dev, "Bytes In = %d  Bytes Out = %d\n", bytes_in, bytes_out); */
 }
 
 
-static int empeg_write (struct usb_serial_port *port, int from_user, const unsigned char *buf, int count)
+static int empeg_write (struct usb_serial_port *port, const unsigned char *buf, int count)
 {
        struct usb_serial *serial = port->serial;
        struct urb *urb;
@@ -235,14 +236,7 @@ static int empeg_write (struct usb_serial_port *port, int from_user, const unsig
 
                transfer_size = min (count, URB_TRANSFER_BUFFER_SIZE);
 
-               if (from_user) {
-                       if (copy_from_user (urb->transfer_buffer, current_position, transfer_size)) {
-                               bytes_sent = -EFAULT;
-                               break;
-                       }
-               } else {
-                       memcpy (urb->transfer_buffer, current_position, transfer_size);
-               }
+               memcpy (urb->transfer_buffer, current_position, transfer_size);
 
                usb_serial_debug_data(debug, &port->dev, __FUNCTION__, transfer_size, urb->transfer_buffer);
 
@@ -350,7 +344,6 @@ static void empeg_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
        struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
        struct tty_struct *tty;
        unsigned char *data = urb->transfer_buffer;
-       int i;
        int result;
 
        dbg("%s - port %d", __FUNCTION__, port->number);
@@ -365,19 +358,8 @@ static void empeg_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
        tty = port->tty;
 
        if (urb->actual_length) {
-               for (i = 0; i < urb->actual_length ; ++i) {
-                       /* gb - 2000/11/13
-                        * If we insert too many characters we'll overflow the buffer.
-                        * This means we'll lose bytes - Decidedly bad.
-                        */
-                       if(tty->flip.count >= TTY_FLIPBUF_SIZE) {
-                               tty_flip_buffer_push(tty);
-                               }
-                       tty_insert_flip_char(tty, data[i], 0);
-               }
-               /* gb - 2000/11/13
-                * Goes straight through instead of scheduling - if tty->low_latency is set.
-                */
+               tty_buffer_request_room(tty, urb->actual_length);
+               tty_insert_flip_string(tty, data, urb->actual_length);
                tty_flip_buffer_push(tty);
                bytes_in += urb->actual_length;
        }
@@ -406,7 +388,7 @@ static void empeg_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
 static void empeg_throttle (struct usb_serial_port *port)
 {
        dbg("%s - port %d", __FUNCTION__, port->number);
-       usb_unlink_urb (port->read_urb);
+       usb_kill_urb(port->read_urb);
 }
 
 
@@ -558,8 +540,7 @@ failed_usb_register:
 failed_usb_serial_register:
        for (i = 0; i < NUM_URBS; ++i) {
                if (write_urb_pool[i]) {
-                       if (write_urb_pool[i]->transfer_buffer)
-                               kfree(write_urb_pool[i]->transfer_buffer);
+                       kfree(write_urb_pool[i]->transfer_buffer);
                        usb_free_urb(write_urb_pool[i]);
                }
        }
@@ -579,12 +560,11 @@ static void __exit empeg_exit (void)
 
        for (i = 0; i < NUM_URBS; ++i) {
                if (write_urb_pool[i]) {
-                       /* FIXME - uncomment the following usb_unlink_urb call when
+                       /* FIXME - uncomment the following usb_kill_urb call when
                         * the host controllers get fixed to set urb->dev = NULL after
                         * the urb is finished.  Otherwise this call oopses. */
-                       /* usb_unlink_urb(write_urb_pool[i]); */
-                       if (write_urb_pool[i]->transfer_buffer)
-                               kfree(write_urb_pool[i]->transfer_buffer);
+                       /* usb_kill_urb(write_urb_pool[i]); */
+                       kfree(write_urb_pool[i]->transfer_buffer);
                        usb_free_urb (write_urb_pool[i]);
                }
        }