This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 2656807..19c92e8 100644 (file)
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -336,6 +336,14 @@
 #include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <linux/usb.h>
+
+
+#ifdef CONFIG_USB_SERIAL_DEBUG
+       static int debug = 1;
+#else
+       static int debug;
+#endif
+
 #include "usb-serial.h"
 #include "pl2303.h"
 
@@ -346,12 +354,26 @@
 #define DRIVER_AUTHOR "Greg Kroah-Hartman, greg@kroah.com, http://www.kroah.com/linux/"
 #define DRIVER_DESC "USB Serial Driver core"
 
+
+#ifdef CONFIG_USB_SERIAL_GENERIC
+/* we want to look at all devices, as the vendor/product id can change
+ * depending on the command line argument */
+static struct usb_device_id generic_serial_ids[] = {
+       {.driver_info = 42},
+       {}
+};
+
+#endif /* CONFIG_USB_SERIAL_GENERIC */
+
 /* Driver structure we register with the USB core */
 static struct usb_driver usb_serial_driver = {
        .owner =        THIS_MODULE,
        .name =         "usbserial",
        .probe =        usb_serial_probe,
        .disconnect =   usb_serial_disconnect,
+#ifdef CONFIG_USB_SERIAL_GENERIC
+       .id_table =     generic_serial_ids,
+#endif
 };
 
 /* There is no MODULE_DEVICE_TABLE for usbserial.c.  Instead
@@ -361,10 +383,10 @@ static struct usb_driver usb_serial_driver = {
    drivers depend on it.
 */
 
-static int debug;
-static struct usb_serial *serial_table[SERIAL_TTY_MINORS];     /* initially all NULL */
+static struct usb_serial       *serial_table[SERIAL_TTY_MINORS];       /* initially all NULL */
 static LIST_HEAD(usb_serial_driver_list);
 
+
 struct usb_serial *usb_serial_get_by_index(unsigned index)
 {
        struct usb_serial *serial = serial_table[index];
@@ -1361,9 +1383,22 @@ error:
 
 void usb_serial_deregister(struct usb_serial_device_type *device)
 {
+       struct usb_serial *serial;
+       int i;
+
        info("USB Serial deregistering driver %s", device->name);
+
+       /* clear out the serial_table if the device is attached to a port */
+       for(i = 0; i < SERIAL_TTY_MINORS; ++i) {
+               serial = serial_table[i];
+               if ((serial != NULL) && (serial->type == device)) {
+                       usb_driver_release_interface (&usb_serial_driver, serial->interface);
+                       usb_serial_disconnect (serial->interface);
+               }
+       }
+
        list_del(&device->driver_list);
-       usb_serial_bus_deregister(device);
+       usb_serial_bus_deregister (device);
 }