Merge tag 'usb-3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB fixes from Greg KH:
 "Here are a number of tiny USB fixes and new device ids for 3.15-rc2.
  Nothing major, just issues some people have reported.

  All of these have been in linux-next"

* tag 'usb-3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  uas: fix deadlocky memory allocations
  uas: fix error handling during scsi_scan()
  uas: fix GFP_NOIO under spinlock
  uwb: adds missing error handling
  USB: cdc-acm: Remove Motorola/Telit H24 serial interfaces from ACM driver
  USB: ohci-jz4740: FEAT_POWER is a port feature, not a hub feature
  USB: ohci-jz4740: Fix uninitialized variable warning
  USB: EHCI: tegra: set txfill_tuning
  usb: ehci-platform: Return immediately from suspend if ehci_suspend fails
  usb: ehci-exynos: Return immediately from suspend if ehci_suspend fails
  USB: fix crash during hotplug of PCI USB controller card
  USB: cdc-acm: fix double usb_autopm_put_interface() in acm_port_activate()
  usb: usb-common: fix typo for usb_state_string
  USB: usb_wwan: fix handling of missing bulk endpoints
  USB: pl2303: add ids for Hewlett-Packard HP POS pole displays
  USB: cp210x: Add 8281 (Nanotec Plug & Drive)
  usb: option driver, add support for Telit UE910v2
  Revert "USB: serial: add usbid for dell wwan card to sierra.c"
  USB: serial: ftdi_sio: add id for Brainboxes serial cards

1 files changed, 25 insertions, 9 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 900f7ff805ee..904efb6035b0 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -518,13 +518,16 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
         if (usb_submit_urb(acm->ctrlurb, GFP_KERNEL)) {
                 dev_err(&acm->control->dev,
                         "%s - usb_submit_urb(ctrl irq) failed\n", __func__);
+                usb_autopm_put_interface(acm->control);
                 goto error_submit_urb;
         }
 
         acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS;
         if (acm_set_control(acm, acm->ctrlout) < 0 &&
-            (acm->ctrl_caps & USB_CDC_CAP_LINE))
+            (acm->ctrl_caps & USB_CDC_CAP_LINE)) {
+                usb_autopm_put_interface(acm->control);
                 goto error_set_control;
+        }
 
         usb_autopm_put_interface(acm->control);
 
@@ -549,7 +552,6 @@ error_submit_read_urbs:
 error_set_control:
         usb_kill_urb(acm->ctrlurb);
 error_submit_urb:
-        usb_autopm_put_interface(acm->control);
 error_get_interface:
 disconnected:
         mutex_unlock(&acm->mutex);
@@ -1652,13 +1654,27 @@ static const struct usb_device_id acm_ids[] = {
         },
         /* Motorola H24 HSPA module: */
         { USB_DEVICE(0x22b8, 0x2d91) }, /* modem                                */
-        { USB_DEVICE(0x22b8, 0x2d92) }, /* modem           + diagnostics        */
-        { USB_DEVICE(0x22b8, 0x2d93) }, /* modem + AT port                      */
-        { USB_DEVICE(0x22b8, 0x2d95) }, /* modem + AT port + diagnostics        */
-        { USB_DEVICE(0x22b8, 0x2d96) }, /* modem                         + NMEA */
-        { USB_DEVICE(0x22b8, 0x2d97) }, /* modem           + diagnostics + NMEA */
-        { USB_DEVICE(0x22b8, 0x2d99) }, /* modem + AT port               + NMEA */
-        { USB_DEVICE(0x22b8, 0x2d9a) }, /* modem + AT port + diagnostics + NMEA */
+        { USB_DEVICE(0x22b8, 0x2d92),   /* modem           + diagnostics        */
+        .driver_info = NO_UNION_NORMAL, /* handle only modem interface          */
+        },
+        { USB_DEVICE(0x22b8, 0x2d93),   /* modem + AT port                      */
+        .driver_info = NO_UNION_NORMAL, /* handle only modem interface          */
+        },
+        { USB_DEVICE(0x22b8, 0x2d95),   /* modem + AT port + diagnostics        */
+        .driver_info = NO_UNION_NORMAL, /* handle only modem interface          */
+        },
+        { USB_DEVICE(0x22b8, 0x2d96),   /* modem                         + NMEA */
+        .driver_info = NO_UNION_NORMAL, /* handle only modem interface          */
+        },
+        { USB_DEVICE(0x22b8, 0x2d97),   /* modem           + diagnostics + NMEA */
+        .driver_info = NO_UNION_NORMAL, /* handle only modem interface          */
+        },
+        { USB_DEVICE(0x22b8, 0x2d99),   /* modem + AT port               + NMEA */
+        .driver_info = NO_UNION_NORMAL, /* handle only modem interface          */
+        },
+        { USB_DEVICE(0x22b8, 0x2d9a),   /* modem + AT port + diagnostics + NMEA */
+        .driver_info = NO_UNION_NORMAL, /* handle only modem interface          */
+        },
 
         { USB_DEVICE(0x0572, 0x1329), /* Hummingbird huc56s (Conexant) */
         .driver_info = NO_UNION_NORMAL, /* union descriptor misplaced on