Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (149 commits)
  USB: ohci-pnx4008: Remove unnecessary cast of return value of kzalloc
  USB: additions to the quirk list
  usb-storage: implement autosuspend
  USB: cdc-acm: add new device id to option driver
  USB: goku_udc trivial cleanups
  USB: usb gadget stack can now -DDEBUG with Kconfig
  usb gadget stack: remove usb_ep_*_buffer(), part 2
  usb gadget stack: remove usb_ep_*_buffer(), part 1
  USB: pxa2xx_udc -- cleanups, mostly removing dma hooks
  USB: pxa2xx_udc: use generic gpio layer
  USB: quirk for samsung printer
  USB: usb/dma doc updates
  USB: drivers/usb/storage/unusual_devs.h whitespace cleanup
  USB: remove Makefile reference to obsolete OHCI_AT91
  USB: io_*: remove bogus termios no change checks
  USB: mos7720: remove bogus no termios change check
  USB: visor and whiteheat: remove bogus termios change checks
  USB: pl2303: remove bogus checks and fix speed support to use tty_get_baud_rate()
  USB: mos7840.c: turn this into a serial driver
  USB: make the usb_device numa_node get assigned from controller
  ...

1 files changed, 33 insertions, 2 deletions

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 87f378806db6..a3665659d13b 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -46,6 +46,8 @@ static struct usb_driver usb_serial_driver = {
         .name =         "usbserial",
         .probe =        usb_serial_probe,
         .disconnect =   usb_serial_disconnect,
+        .suspend =      usb_serial_suspend,
+        .resume =       usb_serial_resume,
         .no_dynamic_id =        1,
 };
 
@@ -120,11 +122,9 @@ static void return_serial(struct usb_serial *serial)
         if (serial == NULL)
                 return;
 
-        spin_lock(&table_lock);
         for (i = 0; i < serial->num_ports; ++i) {
                 serial_table[serial->minor + i] = NULL;
         }
-        spin_unlock(&table_lock);
 }
 
 static void destroy_serial(struct kref *kref)
@@ -172,7 +172,9 @@ static void destroy_serial(struct kref *kref)
 
 void usb_serial_put(struct usb_serial *serial)
 {
+        spin_lock(&table_lock);
         kref_put(&serial->kref, destroy_serial);
+        spin_unlock(&table_lock);
 }
 
 /*****************************************************************************
@@ -1069,6 +1071,35 @@ void usb_serial_disconnect(struct usb_interface *interface)
         dev_info(dev, "device disconnected\n");
 }
 
+int usb_serial_suspend(struct usb_interface *intf, pm_message_t message)
+{
+        struct usb_serial *serial = usb_get_intfdata(intf);
+        struct usb_serial_port *port;
+        int i, r = 0;
+
+        if (serial) {
+                for (i = 0; i < serial->num_ports; ++i) {
+                        port = serial->port[i];
+                        if (port)
+                                kill_traffic(port);
+                }
+        }
+
+        if (serial->type->suspend)
+                serial->type->suspend(serial, message);
+
+        return r;
+}
+EXPORT_SYMBOL(usb_serial_suspend);
+
+int usb_serial_resume(struct usb_interface *intf)
+{
+        struct usb_serial *serial = usb_get_intfdata(intf);
+
+        return serial->type->resume(serial);
+}
+EXPORT_SYMBOL(usb_serial_resume);
+
 static const struct tty_operations serial_ops = {
         .open =                 serial_open,
         .close =                serial_close,