Merge tty-next into 3.6-rc1

This handles the merge issue in:
	arch/um/drivers/line.c
	arch/um/drivers/line.h
And resolves the duplicate patches that were in both trees do to the
tty-next branch not getting merged into 3.6-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

5 files changed, 142 insertions, 111 deletions

diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 6225199119c0..7bcbb47e1449 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -176,7 +176,7 @@ static void keyspan_set_termios(struct tty_struct *tty,
         tty_encode_baud_rate(tty, baud_rate, baud_rate);
         /* set CTS/RTS handshake etc. */
         p_priv->cflag = cflag;
-        p_priv->flow_control = (cflag & CRTSCTS)? flow_cts: flow_none;
+        p_priv->flow_control = (cflag & CRTSCTS) ? flow_cts : flow_none;
 
         /* Mark/Space not supported */
         tty->termios.c_cflag &= ~CMSPAR;
@@ -474,7 +474,7 @@ static void usa28_indat_callback(struct urb *urb)
                 p_priv = usb_get_serial_port_data(port);
                 data = urb->transfer_buffer;
 
-                tty =tty_port_tty_get(&port->port);
+                tty = tty_port_tty_get(&port->port);
                 if (tty && urb->actual_length) {
                         tty_insert_flip_string(tty, data, urb->actual_length);
                         tty_flip_buffer_push(tty);
@@ -557,9 +557,9 @@ static void	usa28_instat_callback(struct urb *urb)
         p_priv->dcd_state = ((msg->dcd) ? 1 : 0);
         p_priv->ri_state = ((msg->ri) ? 1 : 0);
 
-        if( old_dcd_state != p_priv->dcd_state && old_dcd_state) {
+        if (old_dcd_state != p_priv->dcd_state && old_dcd_state) {
                 tty = tty_port_tty_get(&port->port);
-                if (tty && !C_CLOCAL(tty)) 
+                if (tty && !C_CLOCAL(tty))
                         tty_hangup(tty);
                 tty_kref_put(tty);
         }
@@ -1036,15 +1036,12 @@ static int keyspan_write_room(struct tty_struct *tty)
 static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
         struct keyspan_port_private     *p_priv;
-        struct keyspan_serial_private   *s_priv;
-        struct usb_serial               *serial = port->serial;
         const struct keyspan_device_details     *d_details;
         int                             i, err;
         int                             baud_rate, device_port;
         struct urb                      *urb;
         unsigned int                    cflag = 0;
 
-        s_priv = usb_get_serial_data(serial);
         p_priv = usb_get_serial_port_data(port);
         d_details = p_priv->device_details;
 
@@ -1102,7 +1099,7 @@ static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port)
         }
         /* set CTS/RTS handshake etc. */
         p_priv->cflag = cflag;
-        p_priv->flow_control = (cflag & CRTSCTS)? flow_cts: flow_none;
+        p_priv->flow_control = (cflag & CRTSCTS) ? flow_cts : flow_none;
 
         keyspan_send_setup(port, 1);
         /* mdelay(100); */
@@ -1130,10 +1127,8 @@ static void keyspan_close(struct usb_serial_port *port)
 {
         int                     i;
         struct usb_serial       *serial = port->serial;
-        struct keyspan_serial_private   *s_priv;
         struct keyspan_port_private     *p_priv;
 
-        s_priv = usb_get_serial_data(serial);
         p_priv = usb_get_serial_port_data(port);
 
         p_priv->rts_state = 0;
@@ -1240,7 +1235,7 @@ static int keyspan_fake_startup(struct usb_serial *serial)
 
         if (request_ihex_firmware(&fw, fw_name, &serial->dev->dev)) {
                 dev_err(&serial->dev->dev, "Required keyspan firmware image (%s) unavailable.\n", fw_name);
-                return(1);
+                return 1;
         }
 
         dbg("Uploading Keyspan %s firmware.", fw_name);
@@ -1709,7 +1704,7 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial,
                 msg.setPrescaler = 0xff;
         }
 
-        msg.lcr = (p_priv->cflag & CSTOPB)? STOPBITS_678_2: STOPBITS_5678_1;
+        msg.lcr = (p_priv->cflag & CSTOPB) ? STOPBITS_678_2 : STOPBITS_5678_1;
         switch (p_priv->cflag & CSIZE) {
         case CS5:
                 msg.lcr |= USA_DATABITS_5;
@@ -1726,7 +1721,7 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial,
         }
         if (p_priv->cflag & PARENB) {
                 /* note USA_PARITY_NONE == 0 */
-                msg.lcr |= (p_priv->cflag & PARODD)?
+                msg.lcr |= (p_priv->cflag & PARODD) ?
                         USA_PARITY_ODD : USA_PARITY_EVEN;
         }
         msg.setLcr = 0xff;
@@ -1994,7 +1989,7 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial,
                 /* msg.setPrescaler = 0xff; */
         }
 
-        msg.lcr = (p_priv->cflag & CSTOPB)? STOPBITS_678_2: STOPBITS_5678_1;
+        msg.lcr = (p_priv->cflag & CSTOPB) ? STOPBITS_678_2 : STOPBITS_5678_1;
         switch (p_priv->cflag & CSIZE) {
         case CS5:
                 msg.lcr |= USA_DATABITS_5;
@@ -2011,7 +2006,7 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial,
         }
         if (p_priv->cflag & PARENB) {
                 /* note USA_PARITY_NONE == 0 */
-                msg.lcr |= (p_priv->cflag & PARODD)?
+                msg.lcr |= (p_priv->cflag & PARODD) ?
                         USA_PARITY_ODD : USA_PARITY_EVEN;
         }
         msg.setLcr = 0xff;
@@ -2178,7 +2173,7 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial,
                 msg.txMode = TXMODE_BYHAND;
         }
 
-        msg.lcr = (p_priv->cflag & CSTOPB)? STOPBITS_678_2: STOPBITS_5678_1;
+        msg.lcr = (p_priv->cflag & CSTOPB) ? STOPBITS_678_2 : STOPBITS_5678_1;
         switch (p_priv->cflag & CSIZE) {
         case CS5:
                 msg.lcr |= USA_DATABITS_5;
@@ -2195,7 +2190,7 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial,
         }
         if (p_priv->cflag & PARENB) {
                 /* note USA_PARITY_NONE == 0 */
-                msg.lcr |= (p_priv->cflag & PARODD)?
+                msg.lcr |= (p_priv->cflag & PARODD) ?
                         USA_PARITY_ODD : USA_PARITY_EVEN;
         }
         if (p_priv->old_cflag != p_priv->cflag) {
@@ -2322,7 +2317,7 @@ static int keyspan_usa67_send_setup(struct usb_serial *serial,
         }
         if (p_priv->cflag & PARENB) {
                 /* note USA_PARITY_NONE == 0 */
-                msg.lcr |= (p_priv->cflag & PARODD)?
+                msg.lcr |= (p_priv->cflag & PARODD) ?
                                         USA_PARITY_ODD : USA_PARITY_EVEN;
         }
         msg.setLcr = 0xff;
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 417ab1b0aa30..08ff9b862049 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -936,6 +936,8 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0165, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0167, 0xff, 0xff, 0xff),
           .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0326, 0xff, 0xff, 0xff),
+          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1008, 0xff, 0xff, 0xff),
           .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1010, 0xff, 0xff, 0xff),
@@ -1310,6 +1312,10 @@ static struct usb_serial_driver * const serial_drivers[] = {
 
 static bool debug;
 
+struct option_private {
+        u8 bInterfaceNumber;
+};
+
 module_usb_serial_driver(serial_drivers, option_ids);
 
 static bool is_blacklisted(const u8 ifnum, enum option_blacklist_reason reason,
@@ -1340,51 +1346,78 @@ static int option_probe(struct usb_serial *serial,
                         const struct usb_device_id *id)
 {
         struct usb_wwan_intf_private *data;
-
-        /* D-Link DWM 652 still exposes CD-Rom emulation interface in modem mode */
-        if (serial->dev->descriptor.idVendor == DLINK_VENDOR_ID &&
-                serial->dev->descriptor.idProduct == DLINK_PRODUCT_DWM_652 &&
-                serial->interface->cur_altsetting->desc.bInterfaceClass == 0x8)
+        struct option_private *priv;
+        struct usb_interface_descriptor *iface_desc =
+                                &serial->interface->cur_altsetting->desc;
+        struct usb_device_descriptor *dev_desc = &serial->dev->descriptor;
+
+        /*
+         * D-Link DWM 652 still exposes CD-Rom emulation interface in modem
+         * mode.
+         */
+        if (dev_desc->idVendor == DLINK_VENDOR_ID &&
+                dev_desc->idProduct == DLINK_PRODUCT_DWM_652 &&
+                iface_desc->bInterfaceClass == 0x08)
                 return -ENODEV;
 
         /* Bandrich modem and AT command interface is 0xff */
-        if ((serial->dev->descriptor.idVendor == BANDRICH_VENDOR_ID ||
-                serial->dev->descriptor.idVendor == PIRELLI_VENDOR_ID) &&
-                serial->interface->cur_altsetting->desc.bInterfaceClass != 0xff)
+        if ((dev_desc->idVendor == BANDRICH_VENDOR_ID ||
+                dev_desc->idVendor == PIRELLI_VENDOR_ID) &&
+                iface_desc->bInterfaceClass != 0xff)
                 return -ENODEV;
-
-        /* Don't bind reserved interfaces (like network ones) which often have
+        /*
+         * Don't bind reserved interfaces (like network ones) which often have
          * the same class/subclass/protocol as the serial interfaces.  Look at
          * the Windows driver .INF files for reserved interface numbers.
          */
         if (is_blacklisted(
-                serial->interface->cur_altsetting->desc.bInterfaceNumber,
+                iface_desc->bInterfaceNumber,
                 OPTION_BLACKLIST_RESERVED_IF,
                 (const struct option_blacklist_info *) id->driver_info))
                 return -ENODEV;
-
-        /* Don't bind network interface on Samsung GT-B3730, it is handled by a separate module */
-        if (serial->dev->descriptor.idVendor == SAMSUNG_VENDOR_ID &&
-                serial->dev->descriptor.idProduct == SAMSUNG_PRODUCT_GT_B3730 &&
-                serial->interface->cur_altsetting->desc.bInterfaceClass != USB_CLASS_CDC_DATA)
+        /*
+         * Don't bind network interface on Samsung GT-B3730, it is handled by
+         * a separate module.
+         */
+        if (dev_desc->idVendor == SAMSUNG_VENDOR_ID &&
+                dev_desc->idProduct == SAMSUNG_PRODUCT_GT_B3730 &&
+                iface_desc->bInterfaceClass != USB_CLASS_CDC_DATA)
                 return -ENODEV;
 
-        data = serial->private = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL);
+        data = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
-        data->send_setup = option_send_setup;
+
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv) {
+                kfree(data);
+                return -ENOMEM;
+        }
+
+        priv->bInterfaceNumber = iface_desc->bInterfaceNumber;
+        data->private = priv;
+
+        if (!is_blacklisted(iface_desc->bInterfaceNumber,
+                        OPTION_BLACKLIST_SENDSETUP,
+                        (struct option_blacklist_info *)id->driver_info)) {
+                data->send_setup = option_send_setup;
+        }
         spin_lock_init(&data->susp_lock);
-        data->private = (void *)id->driver_info;
+
+        usb_set_serial_data(serial, data);
+
         return 0;
 }
 
 static void option_release(struct usb_serial *serial)
 {
-        struct usb_wwan_intf_private *priv = usb_get_serial_data(serial);
+        struct usb_wwan_intf_private *intfdata = usb_get_serial_data(serial);
+        struct option_private *priv = intfdata->private;
 
         usb_wwan_release(serial);
 
         kfree(priv);
+        kfree(intfdata);
 }
 
 static void option_instat_callback(struct urb *urb)
@@ -1451,18 +1484,11 @@ static void option_instat_callback(struct urb *urb)
 static int option_send_setup(struct usb_serial_port *port)
 {
         struct usb_serial *serial = port->serial;
-        struct usb_wwan_intf_private *intfdata =
-                (struct usb_wwan_intf_private *) serial->private;
+        struct usb_wwan_intf_private *intfdata = usb_get_serial_data(serial);
+        struct option_private *priv = intfdata->private;
         struct usb_wwan_port_private *portdata;
-        int ifNum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
         int val = 0;
 
-        if (is_blacklisted(ifNum, OPTION_BLACKLIST_SENDSETUP,
-                        (struct option_blacklist_info *) intfdata->private)) {
-                dbg("No send_setup on blacklisted interface #%d\n", ifNum);
-                return -EIO;
-        }
-
         portdata = usb_get_serial_port_data(port);
 
         if (portdata->dtr_state)
@@ -1470,9 +1496,9 @@ static int option_send_setup(struct usb_serial_port *port)
         if (portdata->rts_state)
                 val |= 0x02;
 
-        return usb_control_msg(serial->dev,
-                usb_rcvctrlpipe(serial->dev, 0),
-                0x22, 0x21, val, ifNum, NULL, 0, USB_CTRL_SET_TIMEOUT);
+        return usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
+                                0x22, 0x21, val, priv->bInterfaceNumber, NULL,
+                                0, USB_CTRL_SET_TIMEOUT);
 }
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
index 996015c5f1ac..8d103019d6aa 100644
--- a/drivers/usb/serial/qcserial.c
+++ b/drivers/usb/serial/qcserial.c
@@ -105,6 +105,10 @@ static const struct usb_device_id id_table[] = {
         {USB_DEVICE(0x1410, 0xa021)},   /* Novatel Gobi 3000 Composite */
         {USB_DEVICE(0x413c, 0x8193)},   /* Dell Gobi 3000 QDL */
         {USB_DEVICE(0x413c, 0x8194)},   /* Dell Gobi 3000 Composite */
+        {USB_DEVICE(0x1199, 0x68a4)},   /* Sierra Wireless QDL */
+        {USB_DEVICE(0x1199, 0x68a5)},   /* Sierra Wireless Modem */
+        {USB_DEVICE(0x1199, 0x68a8)},   /* Sierra Wireless QDL */
+        {USB_DEVICE(0x1199, 0x68a9)},   /* Sierra Wireless Modem */
         {USB_DEVICE(0x1199, 0x9010)},   /* Sierra Wireless Gobi 3000 QDL */
         {USB_DEVICE(0x1199, 0x9012)},   /* Sierra Wireless Gobi 3000 QDL */
         {USB_DEVICE(0x1199, 0x9013)},   /* Sierra Wireless Gobi 3000 Modem device (MC8355) */
@@ -112,8 +116,24 @@ static const struct usb_device_id id_table[] = {
         {USB_DEVICE(0x1199, 0x9015)},   /* Sierra Wireless Gobi 3000 Modem device */
         {USB_DEVICE(0x1199, 0x9018)},   /* Sierra Wireless Gobi 3000 QDL */
         {USB_DEVICE(0x1199, 0x9019)},   /* Sierra Wireless Gobi 3000 Modem device */
+        {USB_DEVICE(0x1199, 0x901b)},   /* Sierra Wireless MC7770 */
         {USB_DEVICE(0x12D1, 0x14F0)},   /* Sony Gobi 3000 QDL */
         {USB_DEVICE(0x12D1, 0x14F1)},   /* Sony Gobi 3000 Composite */
+
+        /* non Gobi Qualcomm serial devices */
+        {USB_DEVICE_INTERFACE_NUMBER(0x0f3d, 0x68a2, 0)},       /* Sierra Wireless MC7700 Device Management */
+        {USB_DEVICE_INTERFACE_NUMBER(0x0f3d, 0x68a2, 2)},       /* Sierra Wireless MC7700 NMEA */
+        {USB_DEVICE_INTERFACE_NUMBER(0x0f3d, 0x68a2, 3)},       /* Sierra Wireless MC7700 Modem */
+        {USB_DEVICE_INTERFACE_NUMBER(0x114f, 0x68a2, 0)},       /* Sierra Wireless MC7750 Device Management */
+        {USB_DEVICE_INTERFACE_NUMBER(0x114f, 0x68a2, 2)},       /* Sierra Wireless MC7750 NMEA */
+        {USB_DEVICE_INTERFACE_NUMBER(0x114f, 0x68a2, 3)},       /* Sierra Wireless MC7750 Modem */
+        {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x68a2, 0)},       /* Sierra Wireless MC7710 Device Management */
+        {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x68a2, 2)},       /* Sierra Wireless MC7710 NMEA */
+        {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x68a2, 3)},       /* Sierra Wireless MC7710 Modem */
+        {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901c, 0)},       /* Sierra Wireless EM7700 Device Management */
+        {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901c, 2)},       /* Sierra Wireless EM7700 NMEA */
+        {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901c, 3)},       /* Sierra Wireless EM7700 Modem */
+
         { }                             /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, id_table);
@@ -127,6 +147,7 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
         __u8 nintf;
         __u8 ifnum;
         bool is_gobi1k = id->driver_info ? true : false;
+        int altsetting = -1;
 
         dev_dbg(dev, "Is Gobi 1000 = %d\n", is_gobi1k);
 
@@ -142,38 +163,43 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
 
         spin_lock_init(&data->susp_lock);
 
-        switch (nintf) {
-        case 1:
+        if (nintf == 1) {
                 /* QDL mode */
                 /* Gobi 2000 has a single altsetting, older ones have two */
                 if (serial->interface->num_altsetting == 2)
                         intf = &serial->interface->altsetting[1];
                 else if (serial->interface->num_altsetting > 2)
-                        break;
+                        goto done;
 
                 if (intf->desc.bNumEndpoints == 2 &&
                     usb_endpoint_is_bulk_in(&intf->endpoint[0].desc) &&
                     usb_endpoint_is_bulk_out(&intf->endpoint[1].desc)) {
                         dev_dbg(dev, "QDL port found\n");
 
-                        if (serial->interface->num_altsetting == 1) {
+                        if (serial->interface->num_altsetting == 1)
                                 retval = 0; /* Success */
-                                break;
-                        }
-
-                        retval = usb_set_interface(serial->dev, ifnum, 1);
-                        if (retval < 0) {
-                                dev_err(dev,
-                                        "Could not set interface, error %d\n",
-                                        retval);
-                                retval = -ENODEV;
-                                kfree(data);
-                        }
+                        else
+                                altsetting = 1;
                 }
-                break;
+                goto done;
 
-        case 3:
-        case 4:
+        }
+
+        /* allow any number of interfaces when doing direct interface match */
+        if (id->match_flags & USB_DEVICE_ID_MATCH_INT_NUMBER) {
+                dev_dbg(dev, "Generic Qualcomm serial interface found\n");
+                altsetting = 0;
+                goto done;
+        }
+
+        if (nintf < 3 || nintf > 4) {
+                dev_err(dev, "unknown number of interfaces: %d\n", nintf);
+                goto done;
+        }
+
+        /* default to enabling interface */
+        altsetting = 0;
+        switch (ifnum) {
                 /* Composite mode; don't bind to the QMI/net interface as that
                  * gets handled by other drivers.
                  */
@@ -191,53 +217,44 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
                  * 3: NMEA
                  */
 
-                if (ifnum == 1 && !is_gobi1k) {
+        case 1:
+                if (is_gobi1k)
+                        altsetting = -1;
+                else
                         dev_dbg(dev, "Gobi 2K+ DM/DIAG interface found\n");
-                        retval = usb_set_interface(serial->dev, ifnum, 0);
-                        if (retval < 0) {
-                                dev_err(dev,
-                                        "Could not set interface, error %d\n",
-                                        retval);
-                                retval = -ENODEV;
-                                kfree(data);
-                        }
-                } else if (ifnum == 2) {
-                        dev_dbg(dev, "Modem port found\n");
-                        retval = usb_set_interface(serial->dev, ifnum, 0);
-                        if (retval < 0) {
-                                dev_err(dev,
-                                        "Could not set interface, error %d\n",
-                                        retval);
-                                retval = -ENODEV;
-                                kfree(data);
-                        }
-                } else if (ifnum==3 && !is_gobi1k) {
+                break;
+        case 2:
+                dev_dbg(dev, "Modem port found\n");
+                break;
+        case 3:
+                if (is_gobi1k)
+                        altsetting = -1;
+                else
                         /*
                          * NMEA (serial line 9600 8N1)
                          * # echo "\$GPS_START" > /dev/ttyUSBx
                          * # echo "\$GPS_STOP"  > /dev/ttyUSBx
                          */
                         dev_dbg(dev, "Gobi 2K+ NMEA GPS interface found\n");
-                        retval = usb_set_interface(serial->dev, ifnum, 0);
-                        if (retval < 0) {
-                                dev_err(dev,
-                                        "Could not set interface, error %d\n",
-                                        retval);
-                                retval = -ENODEV;
-                                kfree(data);
-                        }
-                }
-                break;
+        }
 
-        default:
-                dev_err(dev, "unknown number of interfaces: %d\n", nintf);
-                kfree(data);
-                retval = -ENODEV;
+done:
+        if (altsetting >= 0) {
+                retval = usb_set_interface(serial->dev, ifnum, altsetting);
+                if (retval < 0) {
+                        dev_err(dev,
+                                "Could not set interface, error %d\n",
+                                retval);
+                        retval = -ENODEV;
+                }
         }
 
-        /* Set serial->private if not returning -ENODEV */
-        if (retval != -ENODEV)
+        /* Set serial->private if not returning error */
+        if (retval == 0)
                 usb_set_serial_data(serial, data);
+        else
+                kfree(data);
+
         return retval;
 }
 
diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c
index 7de6d491a859..7df9cdb053ed 100644
--- a/drivers/usb/serial/quatech2.c
+++ b/drivers/usb/serial/quatech2.c
@@ -345,7 +345,6 @@ static void qt2_set_termios(struct tty_struct *tty,
 static int qt2_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
         struct usb_serial *serial;
-        struct qt2_serial_private *serial_priv;
         struct qt2_port_private *port_priv;
         u8 *data;
         u16 device_port;
@@ -357,7 +356,6 @@ static int qt2_open(struct tty_struct *tty, struct usb_serial_port *port)
         serial = port->serial;
 
         port_priv = usb_get_serial_port_data(port);
-        serial_priv = usb_get_serial_data(serial);
 
         /* set the port to RS232 mode */
         status = qt2_control_msg(serial->dev, QT2_GET_SET_QMCR,
@@ -417,13 +415,11 @@ static int qt2_open(struct tty_struct *tty, struct usb_serial_port *port)
 static void qt2_close(struct usb_serial_port *port)
 {
         struct usb_serial *serial;
-        struct qt2_serial_private *serial_priv;
         struct qt2_port_private *port_priv;
         unsigned long flags;
         int i;
 
         serial = port->serial;
-        serial_priv = usb_get_serial_data(serial);
         port_priv = usb_get_serial_port_data(port);
 
         port_priv->is_open = false;
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index a4e4f3a16c63..b14ebbd73567 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -288,9 +288,6 @@ static const struct usb_device_id id_table[] = {
         /* Sierra Wireless HSPA Non-Composite Device */
         { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6892, 0xFF, 0xFF, 0xFF)},
         { USB_DEVICE(0x1199, 0x6893) }, /* Sierra Wireless Device */
-        { USB_DEVICE(0x1199, 0x68A2),   /* Sierra Wireless MC77xx in QMI mode */
-          .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist
-        },
         { USB_DEVICE(0x1199, 0x68A3),   /* Sierra Wireless Direct IP modems */
           .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist
         },