24 files changed, 271 insertions, 114 deletions

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 5c60be521561..8bd44fda5eaf 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -417,7 +417,7 @@ config USB_SERIAL_MCT_U232
           Magic Control Technology Corp. (U232 is one of the model numbers).
 
           This driver also works with Sitecom U232-P25 and D-Link DU-H3SP USB
-          BAY devices.
+          BAY, Belkin F5U109, and Belkin F5U409 devices.
 
           To compile this driver as a module, choose M here: the
           module will be called mct_u232.
@@ -491,16 +491,22 @@ config USB_SERIAL_XIRCOM
           module will be called keyspan_pda.
 
 config USB_SERIAL_OPTION
-        tristate "USB Option PCMCIA serial driver"
-        depends on USB_SERIAL && USB_OHCI_HCD && PCCARD
+        tristate "USB driver for GSM modems"
+        depends on USB_SERIAL
         help
-          Say Y here if you want to use an Option card. This is a
-          GSM card, controlled by three serial ports which are connected
-          via an OHCI adapter located on a PC card.
+          Say Y here if you have an "Option" GSM PCMCIA card
+          (or an OEM version: branded Huawei, Audiovox, or Novatel).
+
+          These cards feature a built-in OHCI-USB adapter and an
+          internally-connected GSM modem. The USB bus is not
+          accessible externally.
 
           To compile this driver as a module, choose M here: the
           module will be called option.
 
+          If this driver doesn't recognize your device,
+          it might be accessible via the FTDI_SIO driver.
+
 config USB_SERIAL_OMNINET
         tristate "USB ZyXEL omni.net LCD Plus Driver (EXPERIMENTAL)"
         depends on USB_SERIAL && EXPERIMENTAL
diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c
index 694b205f9b73..94b9ba0ff875 100644
--- a/drivers/usb/serial/airprime.c
+++ b/drivers/usb/serial/airprime.c
@@ -16,9 +16,11 @@
 #include "usb-serial.h"
 
 static struct usb_device_id id_table [] = {
+        { USB_DEVICE(0x0c88, 0x17da) }, /* Kyocera Wireless KPC650/Passport */
         { USB_DEVICE(0xf3d, 0x0112) },  /* AirPrime CDMA Wireless PC Card */
         { USB_DEVICE(0x1410, 0x1110) }, /* Novatel Wireless Merlin CDMA */
         { USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless Aircard 580 */
+        { USB_DEVICE(0x1199, 0x0218) }, /* Sierra Wireless MC5720 */
         { },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 8023bb7279b1..f3404e10afb4 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -202,7 +202,7 @@ static void usb_console_write(struct console *co, const char *buf, unsigned coun
         struct usb_serial *serial;
         int retval = -ENODEV;
 
-        if (!port)
+        if (!port || port->serial->dev->state == USB_STATE_NOTATTACHED)
                 return;
         serial = port->serial;
 
@@ -213,17 +213,38 @@ static void usb_console_write(struct console *co, const char *buf, unsigned coun
 
         if (!port->open_count) {
                 dbg ("%s - port not opened", __FUNCTION__);
-                goto exit;
+                return;
         }
 
-        /* pass on to the driver specific version of this function if it is available */
-        if (serial->type->write)
-                retval = serial->type->write(port, buf, count);
-        else
-                retval = usb_serial_generic_write(port, buf, count);
-
-exit:
-        dbg("%s - return value (if we had one): %d", __FUNCTION__, retval);
+        while (count) {
+                unsigned int i;
+                unsigned int lf;
+                /* search for LF so we can insert CR if necessary */
+                for (i=0, lf=0 ; i < count ; i++) {
+                        if (*(buf + i) == 10) {
+                                lf = 1;
+                                i++;
+                                break;
+                        }
+                }
+                /* pass on to the driver specific version of this function if it is available */
+                if (serial->type->write)
+                        retval = serial->type->write(port, buf, i);
+                else
+                        retval = usb_serial_generic_write(port, buf, i);
+                dbg("%s - return value : %d", __FUNCTION__, retval);
+                if (lf) {
+                        /* append CR after LF */
+                        unsigned char cr = 13;
+                        if (serial->type->write)
+                                retval = serial->type->write(port, &cr, 1);
+                        else
+                                retval = usb_serial_generic_write(port, &cr, 1);
+                        dbg("%s - return value : %d", __FUNCTION__, retval);
+                }
+                buf += i;
+                count -= i;
+        }
 }
 
 static struct console usbcons = {
@@ -234,6 +255,14 @@ static struct console usbcons = {
         .index =        -1,
 };
 
+void usb_serial_console_disconnect(struct usb_serial *serial)
+{
+        if (serial && serial->port && serial->port[0] && serial->port[0] == usbcons_info.port) {
+                usb_serial_console_exit();
+                usb_serial_put(serial);
+        }
+}
+
 void usb_serial_console_init (int serial_debug, int minor)
 {
         debug = serial_debug;
@@ -259,6 +288,11 @@ void usb_serial_console_init (int serial_debug, int minor)
 
 void usb_serial_console_exit (void)
 {
-        unregister_console(&usbcons);
+        if (usbcons_info.port) {
+                unregister_console(&usbcons);
+                if (usbcons_info.port->open_count)
+                        usbcons_info.port->open_count--;
+                usbcons_info.port = NULL;
+        }
 }
 
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index e0c2acdb3f06..f8c0cb287736 100644
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -59,6 +59,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x10AB, 0x10C5) }, /* Siemens MC60 Cable */
         { USB_DEVICE(0x10B5, 0xAC70) }, /* Nokia CA-42 USB */
         { USB_DEVICE(0x10C4, 0x803B) }, /* Pololu USB-serial converter */
+        { USB_DEVICE(0x10C4, 0x8066) }, /* Argussoft In-System Programmer */
         { USB_DEVICE(0x10C4, 0x807A) }, /* Crumb128 board */
         { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */
         { USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 2357b1d102d7..1fd5c5a9f2ef 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -469,7 +469,7 @@ static void cyberjack_write_bulk_callback (struct urb *urb, struct pt_regs *regs
 
 exit:
         spin_unlock(&priv->lock);
-        schedule_work(&port->work);
+        usb_serial_port_softint(port);
 }
 
 static int __init cyberjack_init (void)
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 7212fbe3b6f2..5de76efe1b37 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -824,7 +824,7 @@ send:
         priv->bytes_out += count; /* do not count the line control and size bytes */
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        schedule_work(&port->work);
+        usb_serial_port_softint(port);
 } /* cypress_send */
 
 
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index 63f7c78a1152..afca1eae5fb5 100644
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -335,7 +335,7 @@ static void empeg_write_bulk_callback (struct urb *urb, struct pt_regs *regs)
                 return;
         }
 
-        schedule_work(&port->work);
+        usb_serial_port_softint(port);
 }
 
 
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 986d7622273d..b2bfea7c815a 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -500,6 +500,7 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) },
         { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) },
         { },                                    /* Optional parameter entry */
         { }                                     /* Terminating entry */
 };
@@ -1261,7 +1262,6 @@ static void ftdi_shutdown (struct usb_serial *serial)
 
 static int  ftdi_open (struct usb_serial_port *port, struct file *filp)
 { /* ftdi_open */
-        struct termios tmp_termios;
         struct usb_device *dev = port->serial->dev;
         struct ftdi_private *priv = usb_get_serial_port_data(port);
         unsigned long flags;
@@ -1271,8 +1271,8 @@ static int  ftdi_open (struct usb_serial_port *port, struct file *filp)
 
         dbg("%s", __FUNCTION__);
 
-
-        port->tty->low_latency = (priv->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+        if (port->tty)
+                port->tty->low_latency = (priv->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 
         /* No error checking for this (will get errors later anyway) */
         /* See ftdi_sio.h for description of what is reset */
@@ -1286,7 +1286,8 @@ static int  ftdi_open (struct usb_serial_port *port, struct file *filp)
            This is same behaviour as serial.c/rs_open() - Kuba */
 
         /* ftdi_set_termios  will send usb control messages */
-        ftdi_set_termios(port, &tmp_termios);
+        if (port->tty)
+                ftdi_set_termios(port, NULL);
 
         /* FIXME: Flow control might be enabled, so it should be checked -
            we have no control of defaults! */
@@ -1472,7 +1473,7 @@ static void ftdi_write_bulk_callback (struct urb *urb, struct pt_regs *regs)
                 return;
         }
 
-        schedule_work(&port->work);
+        usb_serial_port_softint(port);
 } /* ftdi_write_bulk_callback */
 
 
@@ -1867,7 +1868,7 @@ static void ftdi_set_termios (struct usb_serial_port *port, struct termios *old_
                         err("%s urb failed to set baudrate", __FUNCTION__);
                 }
                 /* Ensure RTS and DTR are raised when baudrate changed from 0 */
-                if ((old_termios->c_cflag & CBAUD) == B0) {
+                if (!old_termios || (old_termios->c_cflag & CBAUD) == B0) {
                         set_mctrl(port, TIOCM_DTR | TIOCM_RTS);
                 }
         }
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index d69a917e768f..6ab2ac845bd7 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -436,6 +436,12 @@
  */
 #define FTDI_ACG_HFDUAL_PID             0xDD20  /* HF Dual ISO Reader (RFID) */
 
+/*
+ * Yost Engineering, Inc. products (www.yostengineering.com).
+ * PID 0xE050 submitted by Aaron Prose.
+ */
+#define FTDI_YEI_SERVOCENTER31_PID      0xE050  /* YEI ServoCenter3.1 USB */
+
 /* Commands */
 #define FTDI_SIO_RESET          0 /* Reset the port */
 #define FTDI_SIO_MODEM_CTRL     1 /* Set the modem control register */
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index 5ec9bf5bac8d..04767759cf8a 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -1012,7 +1012,7 @@ static void garmin_write_bulk_callback (struct urb *urb, struct pt_regs *regs)
                 garmin_data_p->flags |= CLEAR_HALT_REQUIRED;
         }
 
-        schedule_work(&port->work);
+        usb_serial_port_softint(port);
 }
 
 
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index c62cc2876519..07a478c59fb2 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -299,9 +299,7 @@ void usb_serial_generic_write_bulk_callback (struct urb *urb, struct pt_regs *re
                 return;
         }
 
-        usb_serial_port_softint((void *)port);
-
-        schedule_work(&port->work);
+        usb_serial_port_softint(port);
 }
 EXPORT_SYMBOL_GPL(usb_serial_generic_write_bulk_callback);
 
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index b606c5968102..b85d2156dfdc 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -142,7 +142,7 @@ struct edgeport_port {
 
 /* This structure holds all of the individual device information */
 struct edgeport_serial {
-        char                    name[MAX_NAME_LEN+1];           /* string name of this device */
+        char                    name[MAX_NAME_LEN+2];           /* string name of this device */
 
         struct edge_manuf_descriptor    manuf_descriptor;       /* the manufacturer descriptor */
         struct edge_boot_descriptor     boot_descriptor;        /* the boot firmware descriptor */
@@ -270,7 +270,7 @@ static void get_manufacturing_desc	(struct edgeport_serial *edge_serial);
 static void get_boot_desc               (struct edgeport_serial *edge_serial);
 static void load_application_firmware   (struct edgeport_serial *edge_serial);
 
-static void unicode_to_ascii            (char *string, __le16 *unicode, int unicode_size);
+static void unicode_to_ascii(char *string, int buflen, __le16 *unicode, int unicode_size);
 
 
 // ************************************************************************
@@ -373,7 +373,7 @@ static void update_edgeport_E2PROM (struct edgeport_serial *edge_serial)
  *  Get string descriptor from device                                   *
  *                                                                      *
  ************************************************************************/
-static int get_string (struct usb_device *dev, int Id, char *string)
+static int get_string (struct usb_device *dev, int Id, char *string, int buflen)
 {
         struct usb_string_descriptor StringDesc;
         struct usb_string_descriptor *pStringDesc;
@@ -395,7 +395,7 @@ static int get_string (struct usb_device *dev, int Id, char *string)
                 return 0;
         }
 
-        unicode_to_ascii(string,  pStringDesc->wData,     pStringDesc->bLength/2-1);
+        unicode_to_ascii(string, buflen, pStringDesc->wData, pStringDesc->bLength/2);
 
         kfree(pStringDesc);
         return strlen(string);
@@ -2564,16 +2564,20 @@ static void change_port_settings (struct edgeport_port *edge_port, struct termio
  *      ASCII range, but it's only for debugging...
  *      NOTE: expects the unicode in LE format
  ****************************************************************************/
-static void unicode_to_ascii (char *string, __le16 *unicode, int unicode_size)
+static void unicode_to_ascii(char *string, int buflen, __le16 *unicode, int unicode_size)
 {
         int i;
 
-        if (unicode_size <= 0)
+        if (buflen <= 0)        /* never happens, but... */
                 return;
+        --buflen;               /* space for nul */
 
-        for (i = 0; i < unicode_size; ++i)
+        for (i = 0; i < unicode_size; i++) {
+                if (i >= buflen)
+                        break;
                 string[i] = (char)(le16_to_cpu(unicode[i]));
-        string[unicode_size] = 0x00;
+        }
+        string[i] = 0x00;
 }
 
 
@@ -2603,11 +2607,17 @@ static void get_manufacturing_desc (struct edgeport_serial *edge_serial)
                 dbg("  BoardRev:       %d", edge_serial->manuf_descriptor.BoardRev);
                 dbg("  NumPorts:       %d", edge_serial->manuf_descriptor.NumPorts);
                 dbg("  DescDate:       %d/%d/%d", edge_serial->manuf_descriptor.DescDate[0], edge_serial->manuf_descriptor.DescDate[1], edge_serial->manuf_descriptor.DescDate[2]+1900);
-                unicode_to_ascii (string, edge_serial->manuf_descriptor.SerialNumber, edge_serial->manuf_descriptor.SerNumLength/2-1);
+                unicode_to_ascii(string, sizeof(string),
+                    edge_serial->manuf_descriptor.SerialNumber,
+                    edge_serial->manuf_descriptor.SerNumLength/2);
                 dbg("  SerialNumber: %s", string);
-                unicode_to_ascii (string, edge_serial->manuf_descriptor.AssemblyNumber, edge_serial->manuf_descriptor.AssemblyNumLength/2-1);
+                unicode_to_ascii(string, sizeof(string),
+                    edge_serial->manuf_descriptor.AssemblyNumber,
+                    edge_serial->manuf_descriptor.AssemblyNumLength/2);
                 dbg("  AssemblyNumber: %s", string);
-                unicode_to_ascii (string, edge_serial->manuf_descriptor.OemAssyNumber, edge_serial->manuf_descriptor.OemAssyNumLength/2-1);
+                unicode_to_ascii(string, sizeof(string),
+                    edge_serial->manuf_descriptor.OemAssyNumber,
+                    edge_serial->manuf_descriptor.OemAssyNumLength/2);
                 dbg("  OemAssyNumber:  %s", string);
                 dbg("  UartType:       %d", edge_serial->manuf_descriptor.UartType);
                 dbg("  IonPid:         %d", edge_serial->manuf_descriptor.IonPid);
@@ -2720,7 +2730,7 @@ static int edge_startup (struct usb_serial *serial)
         struct edgeport_serial *edge_serial;
         struct edgeport_port *edge_port;
         struct usb_device *dev;
-        int i;
+        int i, j;
 
         dev = serial->dev;
 
@@ -2735,11 +2745,11 @@ static int edge_startup (struct usb_serial *serial)
         usb_set_serial_data(serial, edge_serial);
 
         /* get the name for the device from the device */
-        if ( (i = get_string(dev, dev->descriptor.iManufacturer, &edge_serial->name[0])) != 0) {
-                edge_serial->name[i-1] = ' ';
-        }
-
-        get_string(dev, dev->descriptor.iProduct, &edge_serial->name[i]);
+        i = get_string(dev, dev->descriptor.iManufacturer,
+            &edge_serial->name[0], MAX_NAME_LEN+1);
+        edge_serial->name[i++] = ' ';
+        get_string(dev, dev->descriptor.iProduct,
+            &edge_serial->name[i], MAX_NAME_LEN+2 - i);
 
         dev_info(&serial->dev->dev, "%s detected\n", edge_serial->name);
 
@@ -2784,6 +2794,10 @@ static int edge_startup (struct usb_serial *serial)
                 edge_port = kmalloc (sizeof(struct edgeport_port), GFP_KERNEL);
                 if (edge_port == NULL) {
                         dev_err(&serial->dev->dev, "%s - Out of memory\n", __FUNCTION__);
+                        for (j = 0; j < i; ++j) {
+                                kfree (usb_get_serial_port_data(serial->port[j]));
+                                usb_set_serial_port_data(serial->port[j],  NULL);
+                        }
                         usb_set_serial_data(serial, NULL);
                         kfree(edge_serial);
                         return -ENOMEM;
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index 9a5c97989562..9da6d2a8f2b0 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -870,7 +870,7 @@ static void ipaq_write_bulk_callback(struct urb *urb, struct pt_regs *regs)
                 spin_unlock_irqrestore(&write_list_lock, flags);
         }
 
-        schedule_work(&port->work);
+        usb_serial_port_softint(port);
 }
 
 static int ipaq_write_room(struct usb_serial_port *port)
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index e760a70242c1..a4a0bfeaab00 100644
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -376,7 +376,7 @@ static void ipw_write_bulk_callback(struct urb *urb, struct pt_regs *regs)
         if (urb->status)
                 dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status);
 
-        schedule_work(&port->work);
+        usb_serial_port_softint(port);
 }
 
 static int ipw_write(struct usb_serial_port *port, const unsigned char *buf, int count)
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index 426182ddc42a..9432c7302275 100644
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -408,7 +408,7 @@ static void ir_write_bulk_callback (struct urb *urb, struct pt_regs *regs)
                 urb->actual_length,
                 urb->transfer_buffer);
 
-        schedule_work(&port->work);
+        usb_serial_port_softint(port);
 }
 
 static void ir_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 052b735c4fbd..2cf6ade704e4 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -481,7 +481,7 @@ static void	usa2x_outdat_callback(struct urb *urb, struct pt_regs *regs)
         dbg ("%s - urb %d", __FUNCTION__, urb == p_priv->out_urbs[1]); 
 
         if (port->open_count)
-                schedule_work(&port->work);
+                usb_serial_port_softint(port);
 }
 
 static void     usa26_inack_callback(struct urb *urb, struct pt_regs *regs)
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index 78335a5f7743..65d79f630fa4 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -569,8 +569,7 @@ static void klsi_105_write_bulk_callback ( struct urb *urb, struct pt_regs *regs
                 return;
         }
 
-        /* from generic_write_bulk_callback */
-        schedule_work(&port->work);
+        usb_serial_port_softint(port);
 } /* klsi_105_write_bulk_completion_callback */
 
 
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index 238033a87092..6dcdb5f598b8 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -320,7 +320,7 @@ static void omninet_write_bulk_callback (struct urb *urb, struct pt_regs *regs)
                 return;
         }
 
-        schedule_work(&port->work);
+        usb_serial_port_softint(port);
 }
 
 
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 5cf2b80add7a..b0861b61bba7 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1,5 +1,5 @@
 /*
-  Option Card (PCMCIA to) USB to Serial Driver
+  USB Driver for GSM modems
 
   Copyright (C) 2005  Matthias Urlichs <smurf@smurf.noris.de>
 
@@ -28,15 +28,34 @@
   2005-09-10  v0.4.3 added HUAWEI E600 card and Audiovox AirCard
   2005-09-20  v0.4.4 increased recv buffer size: the card sometimes
                      wants to send >2000 bytes.
-  2006-04-10  v0.4.2 fixed two array overrun errors :-/
+  2006-04-10  v0.5   fixed two array overrun errors :-/
+  2006-04-21  v0.5.1 added support for Sierra Wireless MC8755
+  2006-05-15  v0.6   re-enable multi-port support
+  2006-06-01  v0.6.1 add COBRA
+  2006-06-01  v0.6.2 add backwards-compatibility stuff
+  2006-06-01  v0.6.3 add Novatel Wireless
+  2006-06-01  v0.7   Option => GSM
 
   Work sponsored by: Sigos GmbH, Germany <info@sigos.de>
 
+  This driver exists because the "normal" serial driver doesn't work too well
+  with GSM modems. Issues:
+  - data loss -- one single Receive URB is not nearly enough
+  - nonstandard flow (Option devices) and multiplex (Sierra) control
+  - controlling the baud rate doesn't make sense
+
+  This driver is named "option" because the most common device it's
+  used for is a PC-Card (with an internal OHCI-USB interface, behind
+  which the GSM interface sits), made by Option Inc.
+
+  Some of the "one port" devices actually exhibit multiple USB instances
+  on the USB bus. This is not a bug, these ports are used for different
+  device features.
 */
 
-#define DRIVER_VERSION "v0.4"
+#define DRIVER_VERSION "v0.7.0"
 #define DRIVER_AUTHOR "Matthias Urlichs <smurf@smurf.noris.de>"
-#define DRIVER_DESC "Option Card (PC-Card to) USB to Serial Driver"
+#define DRIVER_DESC "USB Driver for GSM modems"
 
 #include <linux/config.h>
 #include <linux/kernel.h>
@@ -74,22 +93,45 @@ static int  option_tiocmset(struct usb_serial_port *port, struct file *file,
 static int  option_send_setup(struct usb_serial_port *port);
 
 /* Vendor and product IDs */
-#define OPTION_VENDOR_ID                        0x0AF0
-#define HUAWEI_VENDOR_ID                        0x12D1
-#define AUDIOVOX_VENDOR_ID                      0x0F3D
-
-#define OPTION_PRODUCT_OLD              0x5000
-#define OPTION_PRODUCT_FUSION   0x6000
-#define OPTION_PRODUCT_FUSION2  0x6300
-#define HUAWEI_PRODUCT_E600     0x1001
-#define AUDIOVOX_PRODUCT_AIRCARD 0x0112
+#define OPTION_VENDOR_ID                0x0AF0
+#define HUAWEI_VENDOR_ID                0x12D1
+#define AUDIOVOX_VENDOR_ID              0x0F3D
+#define SIERRAWIRELESS_VENDOR_ID        0x1199
+#define NOVATELWIRELESS_VENDOR_ID       0x1410
+
+#define OPTION_PRODUCT_OLD              0x5000
+#define OPTION_PRODUCT_FUSION           0x6000
+#define OPTION_PRODUCT_FUSION2          0x6300
+#define OPTION_PRODUCT_COBRA            0x6500
+#define HUAWEI_PRODUCT_E600             0x1001
+#define AUDIOVOX_PRODUCT_AIRCARD        0x0112
+#define SIERRAWIRELESS_PRODUCT_MC8755   0x6802
+#define NOVATELWIRELESS_PRODUCT_U740    0x1400
 
 static struct usb_device_id option_ids[] = {
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_OLD) },
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION) },
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION2) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
         { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
         { USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) },
+        { USB_DEVICE(SIERRAWIRELESS_VENDOR_ID, SIERRAWIRELESS_PRODUCT_MC8755) },
+        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },
+        { } /* Terminating entry */
+};
+
+static struct usb_device_id option_ids1[] = {
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_OLD) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION2) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
+        { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
+        { USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) },
+        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },
+        { } /* Terminating entry */
+};
+static struct usb_device_id option_ids3[] = {
+        { USB_DEVICE(SIERRAWIRELESS_VENDOR_ID, SIERRAWIRELESS_PRODUCT_MC8755) },
         { } /* Terminating entry */
 };
 
@@ -111,12 +153,39 @@ static struct usb_serial_driver option_3port_device = {
                 .owner =        THIS_MODULE,
                 .name =         "option",
         },
-        .description       = "Option 3G data card",
-        .id_table          = option_ids,
+        .description       = "GSM modem (3-port)",
+        .id_table          = option_ids3,
         .num_interrupt_in  = NUM_DONT_CARE,
         .num_bulk_in       = NUM_DONT_CARE,
         .num_bulk_out      = NUM_DONT_CARE,
-        .num_ports         = 1, /* 3, but the card reports its ports separately */
+        .num_ports         = 3,
+        .open              = option_open,
+        .close             = option_close,
+        .write             = option_write,
+        .write_room        = option_write_room,
+        .chars_in_buffer   = option_chars_in_buffer,
+        .throttle          = option_rx_throttle,
+        .unthrottle        = option_rx_unthrottle,
+        .set_termios       = option_set_termios,
+        .break_ctl         = option_break_ctl,
+        .tiocmget          = option_tiocmget,
+        .tiocmset          = option_tiocmset,
+        .attach            = option_startup,
+        .shutdown          = option_shutdown,
+        .read_int_callback = option_instat_callback,
+};
+
+static struct usb_serial_driver option_1port_device = {
+        .driver = {
+                .owner =        THIS_MODULE,
+                .name =         "option",
+        },
+        .description       = "GSM modem (1-port)",
+        .id_table          = option_ids1,
+        .num_interrupt_in  = NUM_DONT_CARE,
+        .num_bulk_in       = NUM_DONT_CARE,
+        .num_bulk_out      = NUM_DONT_CARE,
+        .num_ports         = 1,
         .open              = option_open,
         .close             = option_close,
         .write             = option_write,
@@ -170,6 +239,9 @@ struct option_port_private {
 static int __init option_init(void)
 {
         int retval;
+        retval = usb_serial_register(&option_1port_device);
+        if (retval)
+                goto failed_1port_device_register;
         retval = usb_serial_register(&option_3port_device);
         if (retval)
                 goto failed_3port_device_register;
@@ -184,6 +256,8 @@ static int __init option_init(void)
 failed_driver_register:
         usb_serial_deregister (&option_3port_device);
 failed_3port_device_register:
+        usb_serial_deregister (&option_1port_device);
+failed_1port_device_register:
         return retval;
 }
 
@@ -191,6 +265,7 @@ static void __exit option_exit(void)
 {
         usb_deregister (&option_driver);
         usb_serial_deregister (&option_3port_device);
+        usb_serial_deregister (&option_1port_device);
 }
 
 module_init(option_init);
@@ -365,8 +440,7 @@ static void option_outdat_callback(struct urb *urb, struct pt_regs *regs)
 
         port = (struct usb_serial_port *) urb->context;
 
-        if (port->open_count)
-                schedule_work(&port->work);
+        usb_serial_port_softint(port);
 }
 
 static void option_instat_callback(struct urb *urb, struct pt_regs *regs)
@@ -573,27 +647,30 @@ static struct urb *option_setup_urb(struct usb_serial *serial, int endpoint,
 /* Setup urbs */
 static void option_setup_urbs(struct usb_serial *serial)
 {
-        int j;
+        int i,j;
         struct usb_serial_port *port;
         struct option_port_private *portdata;
 
         dbg("%s", __FUNCTION__);
 
-        port = serial->port[0];
-        portdata = usb_get_serial_port_data(port);
+
+        for (i = 0; i < serial->num_ports; i++) {
+                port = serial->port[i];
+                portdata = usb_get_serial_port_data(port);
 
         /* Do indat endpoints first */
-        for (j = 0; j < N_IN_URB; ++j) {
-                portdata->in_urbs[j] = option_setup_urb (serial,
-                  port->bulk_in_endpointAddress, USB_DIR_IN, port,
-                  portdata->in_buffer[j], IN_BUFLEN, option_indat_callback);
-        }
+                for (j = 0; j < N_IN_URB; ++j) {
+                        portdata->in_urbs[j] = option_setup_urb (serial,
+                        port->bulk_in_endpointAddress, USB_DIR_IN, port,
+                        portdata->in_buffer[j], IN_BUFLEN, option_indat_callback);
+                }
 
-        /* outdat endpoints */
-        for (j = 0; j < N_OUT_URB; ++j) {
-                portdata->out_urbs[j] = option_setup_urb (serial,
-                  port->bulk_out_endpointAddress, USB_DIR_OUT, port,
-                  portdata->out_buffer[j], OUT_BUFLEN, option_outdat_callback);
+                /* outdat endpoints */
+                for (j = 0; j < N_OUT_URB; ++j) {
+                        portdata->out_urbs[j] = option_setup_urb (serial,
+                        port->bulk_out_endpointAddress, USB_DIR_OUT, port,
+                        portdata->out_buffer[j], OUT_BUFLEN, option_outdat_callback);
+                }
         }
 }
 
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index c96714bb1cb8..d88704387202 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -314,7 +314,7 @@ static void pl2303_send(struct usb_serial_port *port)
                 // TODO: reschedule pl2303_send
         }
 
-        schedule_work(&port->work);
+        usb_serial_port_softint(port);
 }
 
 static int pl2303_write_room(struct usb_serial_port *port)
@@ -600,7 +600,7 @@ static void pl2303_close (struct usb_serial_port *port, struct file *filp)
         unsigned int c_cflag;
         int bps;
         long timeout;
-        wait_queue_t wait;                                              \
+        wait_queue_t wait;
 
         dbg("%s - port %d", __FUNCTION__, port->number);
 
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 9c36f0ece20f..a30135c7cfe6 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -162,12 +162,19 @@ static void destroy_serial(struct kref *kref)
                 }
         }
 
+        flush_scheduled_work();         /* port->work */
+
         usb_put_dev(serial->dev);
 
         /* free up any memory that we allocated */
         kfree (serial);
 }
 
+void usb_serial_put(struct usb_serial *serial)
+{
+        kref_put(&serial->kref, destroy_serial);
+}
+
 /*****************************************************************************
  * Driver tty interface functions
  *****************************************************************************/
@@ -201,12 +208,12 @@ static int serial_open (struct tty_struct *tty, struct file * filp)
          
         ++port->open_count;
 
-        if (port->open_count == 1) {
+        /* set up our port structure making the tty driver
+         * remember our port object, and us it */
+        tty->driver_data = port;
+        port->tty = tty;
 
-                /* set up our port structure making the tty driver
-                 * remember our port object, and us it */
-                tty->driver_data = port;
-                port->tty = tty;
+        if (port->open_count == 1) {
 
                 /* lock this module before we call it
                  * this may fail, which means we must bail out,
@@ -230,9 +237,11 @@ bailout_module_put:
         module_put(serial->type->driver.owner);
 bailout_mutex_unlock:
         port->open_count = 0;
+        tty->driver_data = NULL;
+        port->tty = NULL;
         mutex_unlock(&port->mutex);
 bailout_kref_put:
-        kref_put(&serial->kref, destroy_serial);
+        usb_serial_put(serial);
         return retval;
 }
 
@@ -268,7 +277,7 @@ static void serial_close(struct tty_struct *tty, struct file * filp)
         }
 
         mutex_unlock(&port->mutex);
-        kref_put(&port->serial->kref, destroy_serial);
+        usb_serial_put(port->serial);
 }
 
 static int serial_write (struct tty_struct * tty, const unsigned char *buf, int count)
@@ -276,7 +285,7 @@ static int serial_write (struct tty_struct * tty, const unsigned char *buf, int
         struct usb_serial_port *port = tty->driver_data;
         int retval = -EINVAL;
 
-        if (!port)
+        if (!port || port->serial->dev->state == USB_STATE_NOTATTACHED)
                 goto exit;
 
         dbg("%s - port %d, %d byte(s)", __FUNCTION__, port->number, count);
@@ -296,7 +305,7 @@ exit:
 static int serial_write_room (struct tty_struct *tty) 
 {
         struct usb_serial_port *port = tty->driver_data;
-        int retval = -EINVAL;
+        int retval = -ENODEV;
 
         if (!port)
                 goto exit;
@@ -318,7 +327,7 @@ exit:
 static int serial_chars_in_buffer (struct tty_struct *tty) 
 {
         struct usb_serial_port *port = tty->driver_data;
-        int retval = -EINVAL;
+        int retval = -ENODEV;
 
         if (!port)
                 goto exit;
@@ -473,7 +482,7 @@ static int serial_read_proc (char *page, char **start, off_t off, int count, int
                         begin += length;
                         length = 0;
                 }
-                kref_put(&serial->kref, destroy_serial);
+                usb_serial_put(serial);
         }
         *eof = 1;
 done:
@@ -488,19 +497,18 @@ static int serial_tiocmget (struct tty_struct *tty, struct file *file)
         struct usb_serial_port *port = tty->driver_data;
 
         if (!port)
-                goto exit;
+                return -ENODEV;
 
         dbg("%s - port %d", __FUNCTION__, port->number);
 
         if (!port->open_count) {
                 dbg("%s - port not open", __FUNCTION__);
-                goto exit;
+                return -ENODEV;
         }
 
         if (port->serial->type->tiocmget)
                 return port->serial->type->tiocmget(port, file);
 
-exit:
         return -EINVAL;
 }
 
@@ -510,23 +518,32 @@ static int serial_tiocmset (struct tty_struct *tty, struct file *file,
         struct usb_serial_port *port = tty->driver_data;
 
         if (!port)
-                goto exit;
+                return -ENODEV;
 
         dbg("%s - port %d", __FUNCTION__, port->number);
 
         if (!port->open_count) {
                 dbg("%s - port not open", __FUNCTION__);
-                goto exit;
+                return -ENODEV;
         }
 
         if (port->serial->type->tiocmset)
                 return port->serial->type->tiocmset(port, file, set, clear);
 
-exit:
         return -EINVAL;
 }
 
-void usb_serial_port_softint(void *private)
+/*
+ * We would be calling tty_wakeup here, but unfortunately some line
+ * disciplines have an annoying habit of calling tty->write from
+ * the write wakeup callback (e.g. n_hdlc.c).
+ */
+void usb_serial_port_softint(struct usb_serial_port *port)
+{
+        schedule_work(&port->work);
+}
+
+static void usb_serial_port_work(void *private)
 {
         struct usb_serial_port *port = private;
         struct tty_struct *tty;
@@ -789,7 +806,7 @@ int usb_serial_probe(struct usb_interface *interface,
                 port->serial = serial;
                 spin_lock_init(&port->lock);
                 mutex_init(&port->mutex);
-                INIT_WORK(&port->work, usb_serial_port_softint, port);
+                INIT_WORK(&port->work, usb_serial_port_work, port);
                 serial->port[i] = port;
         }
 
@@ -985,6 +1002,7 @@ void usb_serial_disconnect(struct usb_interface *interface)
         struct device *dev = &interface->dev;
         struct usb_serial_port *port;
 
+        usb_serial_console_disconnect(serial);
         dbg ("%s", __FUNCTION__);
 
         usb_set_intfdata (interface, NULL);
@@ -996,7 +1014,7 @@ void usb_serial_disconnect(struct usb_interface *interface)
                 }
                 /* let the last holder of this object 
                  * cause it to be cleaned up */
-                kref_put(&serial->kref, destroy_serial);
+                usb_serial_put(serial);
         }
         dev_info(dev, "device disconnected\n");
 }
diff --git a/drivers/usb/serial/usb-serial.h b/drivers/usb/serial/usb-serial.h
index dc89d8710460..d53ea9b11e81 100644
--- a/drivers/usb/serial/usb-serial.h
+++ b/drivers/usb/serial/usb-serial.h
@@ -236,7 +236,7 @@ struct usb_serial_driver {
 
 extern int  usb_serial_register(struct usb_serial_driver *driver);
 extern void usb_serial_deregister(struct usb_serial_driver *driver);
-extern void usb_serial_port_softint(void *private);
+extern void usb_serial_port_softint(struct usb_serial_port *port);
 
 extern int usb_serial_probe(struct usb_interface *iface, const struct usb_device_id *id);
 extern void usb_serial_disconnect(struct usb_interface *iface);
@@ -248,13 +248,16 @@ extern int ezusb_set_reset (struct usb_serial *serial, unsigned char reset_bit);
 #ifdef CONFIG_USB_SERIAL_CONSOLE
 extern void usb_serial_console_init (int debug, int minor);
 extern void usb_serial_console_exit (void);
+extern void usb_serial_console_disconnect(struct usb_serial *serial);
 #else
 static inline void usb_serial_console_init (int debug, int minor) { }
 static inline void usb_serial_console_exit (void) { }
+static inline void usb_serial_console_disconnect(struct usb_serial *serial) {}
 #endif
 
 /* Functions needed by other parts of the usbserial core */
 extern struct usb_serial *usb_serial_get_by_index (unsigned int minor);
+extern void usb_serial_put(struct usb_serial *serial);
 extern int usb_serial_generic_open (struct usb_serial_port *port, struct file *filp);
 extern int usb_serial_generic_write (struct usb_serial_port *port, const unsigned char *buf, int count);
 extern void usb_serial_generic_close (struct usb_serial_port *port, struct file *filp);
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index f5c3841d4843..9e89b8d54f72 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -480,7 +480,7 @@ static void visor_write_bulk_callback (struct urb *urb, struct pt_regs *regs)
         --priv->outstanding_urbs;
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        schedule_work(&port->work);
+        usb_serial_port_softint(port);
 }
 
 
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index f806553cd9a4..5b06fa366098 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -388,7 +388,7 @@ static int whiteheat_attach (struct usb_serial *serial)
         if (ret) {
                 err("%s: Couldn't send command [%d]", serial->type->description, ret);
                 goto no_firmware;
-        } else if (alen != sizeof(command)) {
+        } else if (alen != 2) {
                 err("%s: Send command incomplete [%d]", serial->type->description, alen);
                 goto no_firmware;
         }
@@ -400,7 +400,7 @@ static int whiteheat_attach (struct usb_serial *serial)
         if (ret) {
                 err("%s: Couldn't get results [%d]", serial->type->description, ret);
                 goto no_firmware;
-        } else if (alen != sizeof(result)) {
+        } else if (alen != sizeof(*hw_info) + 1) {
                 err("%s: Get results incomplete [%d]", serial->type->description, alen);
                 goto no_firmware;
         } else if (result[0] != command[0]) {
@@ -1089,9 +1089,7 @@ static void whiteheat_write_callback(struct urb *urb, struct pt_regs *regs)
                 return;
         }
 
-        usb_serial_port_softint((void *)port);
-
-        schedule_work(&port->work);
+        usb_serial_port_softint(port);
 }