1 files changed, 28 insertions, 33 deletions

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index a30135c7cfe6..0222d92842b8 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -16,7 +16,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -32,7 +31,7 @@
 #include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <linux/usb.h>
-#include "usb-serial.h"
+#include <linux/usb/serial.h>
 #include "pl2303.h"
 
 /*
@@ -41,6 +40,8 @@
 #define DRIVER_AUTHOR "Greg Kroah-Hartman, greg@kroah.com, http://www.kroah.com/linux/"
 #define DRIVER_DESC "USB Serial Driver core"
 
+static void port_free(struct usb_serial_port *port);
+
 /* Driver structure we register with the USB core */
 static struct usb_driver usb_serial_driver = {
         .name =         "usbserial",
@@ -147,23 +148,10 @@ static void destroy_serial(struct kref *kref)
                         port = serial->port[i];
                         if (!port)
                                 continue;
-                        usb_kill_urb(port->read_urb);
-                        usb_free_urb(port->read_urb);
-                        usb_kill_urb(port->write_urb);
-                        usb_free_urb(port->write_urb);
-                        usb_kill_urb(port->interrupt_in_urb);
-                        usb_free_urb(port->interrupt_in_urb);
-                        usb_kill_urb(port->interrupt_out_urb);
-                        usb_free_urb(port->interrupt_out_urb);
-                        kfree(port->bulk_in_buffer);
-                        kfree(port->bulk_out_buffer);
-                        kfree(port->interrupt_in_buffer);
-                        kfree(port->interrupt_out_buffer);
+                        port_free(port);
                 }
         }
 
-        flush_scheduled_work();         /* port->work */
-
         usb_put_dev(serial->dev);
 
         /* free up any memory that we allocated */
@@ -476,8 +464,10 @@ static int serial_read_proc (char *page, char **start, off_t off, int count, int
                 length += sprintf (page+length, " path:%s", tmp);
                         
                 length += sprintf (page+length, "\n");
-                if ((length + begin) > (off + count))
+                if ((length + begin) > (off + count)) {
+                        usb_serial_put(serial);
                         goto done;
+                }
                 if ((length + begin) < off) {
                         begin += length;
                         length = 0;
@@ -565,6 +555,11 @@ static void port_release(struct device *dev)
         struct usb_serial_port *port = to_usb_serial_port(dev);
 
         dbg ("%s - %s", __FUNCTION__, dev->bus_id);
+        port_free(port);
+}
+
+static void port_free(struct usb_serial_port *port)
+{
         usb_kill_urb(port->read_urb);
         usb_free_urb(port->read_urb);
         usb_kill_urb(port->write_urb);
@@ -577,6 +572,7 @@ static void port_release(struct device *dev)
         kfree(port->bulk_out_buffer);
         kfree(port->interrupt_in_buffer);
         kfree(port->interrupt_out_buffer);
+        flush_scheduled_work();         /* port->work */
         kfree(port);
 }
 
@@ -680,33 +676,29 @@ int usb_serial_probe(struct usb_interface *interface,
         iface_desc = interface->cur_altsetting;
         for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
                 endpoint = &iface_desc->endpoint[i].desc;
-                
-                if ((endpoint->bEndpointAddress & 0x80) &&
-                    ((endpoint->bmAttributes & 3) == 0x02)) {
+
+                if (usb_endpoint_is_bulk_in(endpoint)) {
                         /* we found a bulk in endpoint */
                         dbg("found bulk in on endpoint %d", i);
                         bulk_in_endpoint[num_bulk_in] = endpoint;
                         ++num_bulk_in;
                 }
 
-                if (((endpoint->bEndpointAddress & 0x80) == 0x00) &&
-                    ((endpoint->bmAttributes & 3) == 0x02)) {
+                if (usb_endpoint_is_bulk_out(endpoint)) {
                         /* we found a bulk out endpoint */
                         dbg("found bulk out on endpoint %d", i);
                         bulk_out_endpoint[num_bulk_out] = endpoint;
                         ++num_bulk_out;
                 }
-                
-                if ((endpoint->bEndpointAddress & 0x80) &&
-                    ((endpoint->bmAttributes & 3) == 0x03)) {
+
+                if (usb_endpoint_is_int_in(endpoint)) {
                         /* we found a interrupt in endpoint */
                         dbg("found interrupt in on endpoint %d", i);
                         interrupt_in_endpoint[num_interrupt_in] = endpoint;
                         ++num_interrupt_in;
                 }
 
-                if (((endpoint->bEndpointAddress & 0x80) == 0x00) &&
-                    ((endpoint->bmAttributes & 3) == 0x03)) {
+                if (usb_endpoint_is_int_out(endpoint)) {
                         /* we found an interrupt out endpoint */
                         dbg("found interrupt out on endpoint %d", i);
                         interrupt_out_endpoint[num_interrupt_out] = endpoint;
@@ -720,14 +712,15 @@ int usb_serial_probe(struct usb_interface *interface,
         if (((le16_to_cpu(dev->descriptor.idVendor) == PL2303_VENDOR_ID) &&
              (le16_to_cpu(dev->descriptor.idProduct) == PL2303_PRODUCT_ID)) ||
             ((le16_to_cpu(dev->descriptor.idVendor) == ATEN_VENDOR_ID) &&
-             (le16_to_cpu(dev->descriptor.idProduct) == ATEN_PRODUCT_ID))) {
+             (le16_to_cpu(dev->descriptor.idProduct) == ATEN_PRODUCT_ID)) ||
+            ((le16_to_cpu(dev->descriptor.idVendor) == ALCOR_VENDOR_ID) &&
+             (le16_to_cpu(dev->descriptor.idProduct) == ALCOR_PRODUCT_ID))) {
                 if (interface != dev->actconfig->interface[0]) {
                         /* check out the endpoints of the other interface*/
                         iface_desc = dev->actconfig->interface[0]->cur_altsetting;
                         for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
                                 endpoint = &iface_desc->endpoint[i].desc;
-                                if ((endpoint->bEndpointAddress & 0x80) &&
-                                    ((endpoint->bmAttributes & 3) == 0x03)) {
+                                if (usb_endpoint_is_int_in(endpoint)) {
                                         /* we found a interrupt in endpoint */
                                         dbg("found interrupt in for Prolific device on separate interface");
                                         interrupt_in_endpoint[num_interrupt_in] = endpoint;
@@ -941,7 +934,10 @@ int usb_serial_probe(struct usb_interface *interface,
 
                 snprintf (&port->dev.bus_id[0], sizeof(port->dev.bus_id), "ttyUSB%d", port->number);
                 dbg ("%s - registering %s", __FUNCTION__, port->dev.bus_id);
-                device_register (&port->dev);
+                retval = device_register(&port->dev);
+                if (retval)
+                        dev_err(&port->dev, "Error registering port device, "
+                                "continuing\n");
         }
 
         usb_serial_console_init (debug, minor);
@@ -1059,13 +1055,12 @@ static int __init usb_serial_init(void)
 
         usb_serial_tty_driver->owner = THIS_MODULE;
         usb_serial_tty_driver->driver_name = "usbserial";
-        usb_serial_tty_driver->devfs_name = "usb/tts/";
         usb_serial_tty_driver->name =   "ttyUSB";
         usb_serial_tty_driver->major = SERIAL_TTY_MAJOR;
         usb_serial_tty_driver->minor_start = 0;
         usb_serial_tty_driver->type = TTY_DRIVER_TYPE_SERIAL;
         usb_serial_tty_driver->subtype = SERIAL_TYPE_NORMAL;
-        usb_serial_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;
+        usb_serial_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
         usb_serial_tty_driver->init_termios = tty_std_termios;
         usb_serial_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
         tty_set_operations(usb_serial_tty_driver, &serial_ops);