Merge branch 'linus' into x86/urgent

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index efc4373ededb..c257453fa9de 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -589,8 +589,8 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)
         tasklet_schedule(&acm->urb_task);
 
 done:
-err_out:
         mutex_unlock(&acm->mutex);
+err_out:
         mutex_unlock(&open_mutex);
         return rv;
 
@@ -1362,6 +1362,9 @@ static struct usb_device_id acm_ids[] = {
         { USB_DEVICE(0x0803, 0x3095), /* Zoom Telephonics Model 3095F USB MODEM */
         .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
         },
+        { USB_DEVICE(0x0572, 0x1321), /* Conexant USB MODEM CX93010 */
+        .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
+        },
 
         /* control interfaces with various AT-command sets */
         { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,