Merge commit 'v2.6.30-rc1' into core/urgent

Merge reason: need latest upstream to queue up dependent fix

Signed-off-by: Ingo Molnar <mingo@elte.hu>

5 files changed, 8 insertions, 70 deletions

diff --git a/drivers/usb/serial/ChangeLog.history b/drivers/usb/serial/ChangeLog.history
index c1b279939bbf..f13fd488ebec 100644
--- a/drivers/usb/serial/ChangeLog.history
+++ b/drivers/usb/serial/ChangeLog.history
@@ -715,7 +715,7 @@ io_edgeport.c Change Log comments:
 
  0.2 (01/30/2000) greg kroah-hartman
         Milestone 1 release.
-        Device is found by USB subsystem, enumerated, fimware is downloaded
+        Device is found by USB subsystem, enumerated, firmware is downloaded
         and the descriptors are printed to the debug log, config is set, and
         green light starts to blink. Open port works, and data can be sent
         and received at the default settings of the UART. Loopback connector
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index a65f9196b0a0..c480ea4c19f2 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -518,8 +518,8 @@ config USB_SERIAL_SIERRAWIRELESS
         help
           Say M here if you want to use Sierra Wireless devices.
 
-          Many deviecs have a feature known as TRU-Install, for those devices
-          to work properly the USB Storage Sierra feature must be enabled.
+          Many devices have a feature known as TRU-Install. For those devices
+          to work properly, the USB Storage Sierra feature must be enabled.
 
           To compile this driver as a module, choose M here: the
           module will be called sierra.
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 1aed584be5eb..751a533a4347 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -79,6 +79,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X65) },
         { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X75) },
         { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_EF81) },
+        { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_ID_S81) }, /* Benq/Siemens S81 */
         { USB_DEVICE(SYNTECH_VENDOR_ID, SYNTECH_PRODUCT_ID) },
         { USB_DEVICE(NOKIA_CA42_VENDOR_ID, NOKIA_CA42_PRODUCT_ID) },
         { USB_DEVICE(CA_42_CA42_VENDOR_ID, CA_42_CA42_PRODUCT_ID) },
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index 54974f446a8c..1d7a22e3a9fd 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -7,6 +7,10 @@
  *      (at your option) any later version.
  * 
  */
+
+#define BENQ_VENDOR_ID                  0x04a5
+#define BENQ_PRODUCT_ID_S81             0x4027
+
 #define PL2303_VENDOR_ID        0x067b
 #define PL2303_PRODUCT_ID       0x2303
 #define PL2303_PRODUCT_ID_RSAQ2         0x04bb
diff --git a/drivers/usb/serial/symbolserial.c b/drivers/usb/serial/symbolserial.c
index 8b3cbc87adc7..69879e437940 100644
--- a/drivers/usb/serial/symbolserial.c
+++ b/drivers/usb/serial/symbolserial.c
@@ -139,14 +139,6 @@ static int symbol_open(struct tty_struct *tty, struct usb_serial_port *port,
         priv->port = port;
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        /*
-         * Force low_latency on so that our tty_push actually forces the data
-         * through, otherwise it is scheduled, and with high data rates (like
-         * with OHCI) data can get lost.
-         */
-        if (tty)
-                tty->low_latency = 1;
-
         /* Start reading from the device */
         usb_fill_int_urb(priv->int_urb, priv->udev,
                          usb_rcvintpipe(priv->udev, priv->int_address),
@@ -205,62 +197,6 @@ static void symbol_unthrottle(struct tty_struct *tty)
                                                         __func__, result);
 }
 
-static int symbol_ioctl(struct tty_struct *tty, struct file *file,
-                        unsigned int cmd, unsigned long arg)
-{
-        struct usb_serial_port *port = tty->driver_data;
-        struct device *dev = &port->dev;
-
-        /*
-         * Right now we need to figure out what commands
-         * most userspace tools want to see for this driver,
-         * so just log the things.
-         */
-        switch (cmd) {
-        case TIOCSERGETLSR:
-                dev_info(dev, "%s: TIOCSERGETLSR\n", __func__);
-                break;
-
-        case TIOCGSERIAL:
-                dev_info(dev, "%s: TIOCGSERIAL\n", __func__);
-                break;
-
-        case TIOCMIWAIT:
-                dev_info(dev, "%s: TIOCMIWAIT\n", __func__);
-                break;
-
-        case TIOCGICOUNT:
-                dev_info(dev, "%s: TIOCGICOUNT\n", __func__);
-                break;
-        default:
-                dev_info(dev, "%s: unknown (%d)\n", __func__, cmd);
-        }
-        return -ENOIOCTLCMD;
-}
-
-static int symbol_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct usb_serial_port *port = tty->driver_data;
-        struct device *dev = &port->dev;
-
-        /* TODO */
-        /* probably just need to shadow whatever was sent to us here */
-        dev_info(dev, "%s\n", __func__);
-        return 0;
-}
-
-static int symbol_tiocmset(struct tty_struct *tty, struct file *file,
-                           unsigned int set, unsigned int clear)
-{
-        struct usb_serial_port *port = tty->driver_data;
-        struct device *dev = &port->dev;
-
-        /* TODO */
-        /* probably just need to shadow whatever was sent to us here */
-        dev_info(dev, "%s\n", __func__);
-        return 0;
-}
-
 static int symbol_startup(struct usb_serial *serial)
 {
         struct symbol_private *priv;
@@ -367,9 +303,6 @@ static struct usb_serial_driver symbol_device = {
         .shutdown =             symbol_shutdown,
         .throttle =             symbol_throttle,
         .unthrottle =           symbol_unthrottle,
-        .ioctl =                symbol_ioctl,
-        .tiocmget =             symbol_tiocmget,
-        .tiocmset =             symbol_tiocmset,
 };
 
 static int __init symbol_init(void)