Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (172 commits)
  USB: Add support for SuperSpeed isoc endpoints
  xhci: Clean up cycle bit math used during stalls.
  xhci: Fix cycle bit calculation during stall handling.
  xhci: Update internal dequeue pointers after stalls.
  USB: Disable auto-suspend for USB 3.0 hubs.
  USB: Remove bogus USB_PORT_STAT_SUPER_SPEED symbol.
  xhci: Return canceled URBs immediately when host is halted.
  xhci: Fixes for suspend/resume of shared HCDs.
  xhci: Fix re-init on power loss after resume.
  xhci: Make roothub functions deal with device removal.
  xhci: Limit roothub ports to 15 USB3 & 31 USB2 ports.
  xhci: Return a USB 3.0 hub descriptor for USB3 roothub.
  xhci: Register second xHCI roothub.
  xhci: Change xhci_find_slot_id_by_port() API.
  xhci: Refactor bus suspend state into a struct.
  xhci: Index with a port array instead of PORTSC addresses.
  USB: Set usb_hcd->state and flags for shared roothubs.
  usb: Make core allocate resources per PCI-device.
  usb: Store bus type in usb_hcd, not in driver flags.
  usb: Change usb_hcd->bandwidth_mutex to a pointer.
  ...

1 files changed, 12 insertions, 4 deletions

diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 0457813eebee..5b88b6836a81 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -376,7 +376,10 @@ static int sierra_send_setup(struct usb_serial_port *port)
         if (!do_send)
                 return 0;
 
-        usb_autopm_get_interface(serial->interface);
+        retval = usb_autopm_get_interface(serial->interface);
+        if (retval < 0)
+                return retval;
+
         retval = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
                 0x22, 0x21, val, interface, NULL, 0, USB_CTRL_SET_TIMEOUT);
         usb_autopm_put_interface(serial->interface);
@@ -811,8 +814,12 @@ static void sierra_close(struct usb_serial_port *port)
                 mutex_lock(&serial->disc_mutex);
                 if (!serial->disconnected) {
                         serial->interface->needs_remote_wakeup = 0;
-                        usb_autopm_get_interface(serial->interface);
-                        sierra_send_setup(port);
+                        /* odd error handling due to pm counters */
+                        if (!usb_autopm_get_interface(serial->interface))
+                                sierra_send_setup(port);
+                        else
+                                usb_autopm_get_interface_no_resume(serial->interface);
+                                
                 }
                 mutex_unlock(&serial->disc_mutex);
                 spin_lock_irq(&intfdata->susp_lock);
@@ -865,7 +872,8 @@ static int sierra_open(struct tty_struct *tty, struct usb_serial_port *port)
                 /* get rid of everything as in close */
                 sierra_close(port);
                 /* restore balance for autopm */
-                usb_autopm_put_interface(serial->interface);
+                if (!serial->disconnected)
+                        usb_autopm_put_interface(serial->interface);
                 return err;
         }
         sierra_send_setup(port);