4 files changed, 22 insertions, 19 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index dac7676ce21b..e8c564a53346 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -539,7 +539,6 @@ static void acm_port_down(struct acm *acm)
 {
         int i;
 
-        mutex_lock(&open_mutex);
         if (acm->dev) {
                 usb_autopm_get_interface(acm->control);
                 acm_set_control(acm, acm->ctrlout = 0);
@@ -551,14 +550,15 @@ static void acm_port_down(struct acm *acm)
                 acm->control->needs_remote_wakeup = 0;
                 usb_autopm_put_interface(acm->control);
         }
-        mutex_unlock(&open_mutex);
 }
 
 static void acm_tty_hangup(struct tty_struct *tty)
 {
         struct acm *acm = tty->driver_data;
         tty_port_hangup(&acm->port);
+        mutex_lock(&open_mutex);
         acm_port_down(acm);
+        mutex_unlock(&open_mutex);
 }
 
 static void acm_tty_close(struct tty_struct *tty, struct file *filp)
@@ -569,8 +569,9 @@ static void acm_tty_close(struct tty_struct *tty, struct file *filp)
            shutdown */
         if (!acm)
                 return;
+
+        mutex_lock(&open_mutex);
         if (tty_port_close_start(&acm->port, tty, filp) == 0) {
-                mutex_lock(&open_mutex);
                 if (!acm->dev) {
                         tty_port_tty_set(&acm->port, NULL);
                         acm_tty_unregister(acm);
@@ -582,6 +583,7 @@ static void acm_tty_close(struct tty_struct *tty, struct file *filp)
         acm_port_down(acm);
         tty_port_close_end(&acm->port, tty);
         tty_port_tty_set(&acm->port, NULL);
+        mutex_unlock(&open_mutex);
 }
 
 static int acm_tty_write(struct tty_struct *tty,
@@ -1058,11 +1060,11 @@ made_compressed_probe:
                 goto alloc_fail;
         }
 
-        ctrlsize = le16_to_cpu(epctrl->wMaxPacketSize);
-        readsize = le16_to_cpu(epread->wMaxPacketSize) *
+        ctrlsize = usb_endpoint_maxp(epctrl);
+        readsize = usb_endpoint_maxp(epread) *
                                 (quirks == SINGLE_RX_URB ? 1 : 2);
         acm->combined_interfaces = combined_interfaces;
-        acm->writesize = le16_to_cpu(epwrite->wMaxPacketSize) * 20;
+        acm->writesize = usb_endpoint_maxp(epwrite) * 20;
         acm->control = control_interface;
         acm->data = data_interface;
         acm->minor = minor;
@@ -1305,7 +1307,7 @@ static int acm_suspend(struct usb_interface *intf, pm_message_t message)
         struct acm *acm = usb_get_intfdata(intf);
         int cnt;
 
-        if (message.event & PM_EVENT_AUTO) {
+        if (PMSG_IS_AUTO(message)) {
                 int b;
 
                 spin_lock_irq(&acm->write_lock);
@@ -1534,6 +1536,9 @@ static const struct usb_device_id acm_ids[] = {
         { NOKIA_PCSUITE_ACM_INFO(0x03cd), }, /* Nokia C7 */
         { SAMSUNG_PCSUITE_ACM_INFO(0x6651), }, /* Samsung GTi8510 (INNOV8) */
 
+        /* Support for Owen devices */
+        { USB_DEVICE(0x03eb, 0x0030), }, /* Owen SI30 */
+
         /* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */
 
         /* Support Lego NXT using pbLua firmware */
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 2b9ff518b509..efe684908c1f 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -682,7 +682,7 @@ next_desc:
         if (!ep || !usb_endpoint_is_int_in(ep))
                 goto err;
 
-        desc->wMaxPacketSize = le16_to_cpu(ep->wMaxPacketSize);
+        desc->wMaxPacketSize = usb_endpoint_maxp(ep);
         desc->bMaxPacketSize0 = udev->descriptor.bMaxPacketSize0;
 
         desc->orq = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL);
@@ -798,11 +798,11 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message)
         dev_dbg(&desc->intf->dev, "wdm%d_suspend\n", intf->minor);
 
         /* if this is an autosuspend the caller does the locking */
-        if (!(message.event & PM_EVENT_AUTO))
+        if (!PMSG_IS_AUTO(message))
                 mutex_lock(&desc->lock);
         spin_lock_irq(&desc->iuspin);
 
-        if ((message.event & PM_EVENT_AUTO) &&
+        if (PMSG_IS_AUTO(message) &&
                         (test_bit(WDM_IN_USE, &desc->flags)
                         || test_bit(WDM_RESPONDING, &desc->flags))) {
                 spin_unlock_irq(&desc->iuspin);
@@ -815,7 +815,7 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message)
                 kill_urbs(desc);
                 cancel_work_sync(&desc->rxwork);
         }
-        if (!(message.event & PM_EVENT_AUTO))
+        if (!PMSG_IS_AUTO(message))
                 mutex_unlock(&desc->lock);
 
         return rv;
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index 9eca4053312e..cb3a93243a05 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -58,6 +58,7 @@
 #include <linux/mutex.h>
 #undef DEBUG
 #include <linux/usb.h>
+#include <linux/ratelimit.h>
 
 /*
  * Version Information
@@ -348,8 +349,7 @@ static int usblp_check_status(struct usblp *usblp, int err)
         mutex_lock(&usblp->mut);
         if ((error = usblp_read_status(usblp, usblp->statusbuf)) < 0) {
                 mutex_unlock(&usblp->mut);
-                if (printk_ratelimit())
-                        printk(KERN_ERR
+                printk_ratelimited(KERN_ERR
                                 "usblp%d: error %d reading printer status\n",
                                 usblp->minor, error);
                 return 0;
@@ -653,8 +653,7 @@ static long usblp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
                 case LPGETSTATUS:
                         if ((retval = usblp_read_status(usblp, usblp->statusbuf))) {
-                                if (printk_ratelimit())
-                                        printk(KERN_ERR "usblp%d:"
+                                printk_ratelimited(KERN_ERR "usblp%d:"
                                             "failed reading printer status (%d)\n",
                                             usblp->minor, retval);
                                 retval = -EIO;
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 385acb895ab3..12cf5e7395a8 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -186,8 +186,7 @@ static int usbtmc_ioctl_abort_bulk_in(struct usbtmc_device_data *data)
         for (n = 0; n < current_setting->desc.bNumEndpoints; n++)
                 if (current_setting->endpoint[n].desc.bEndpointAddress ==
                         data->bulk_in)
-                        max_size = le16_to_cpu(current_setting->endpoint[n].
-                                                desc.wMaxPacketSize);
+                        max_size = usb_endpoint_maxp(&current_setting->endpoint[n].desc);
 
         if (max_size == 0) {
                 dev_err(dev, "Couldn't get wMaxPacketSize\n");
@@ -268,7 +267,7 @@ usbtmc_abort_bulk_in_status:
                                 dev_err(dev, "usb_bulk_msg returned %d\n", rv);
                                 goto exit;
                         }
-                } while ((actual = max_size) &&
+                } while ((actual == max_size) &&
                          (n < USBTMC_MAX_READS_TO_CLEAR_BULK_IN));
 
         if (actual == max_size) {
@@ -636,7 +635,7 @@ static int usbtmc_ioctl_clear(struct usbtmc_device_data *data)
         for (n = 0; n < current_setting->desc.bNumEndpoints; n++) {
                 desc = &current_setting->endpoint[n].desc;
                 if (desc->bEndpointAddress == data->bulk_in)
-                        max_size = le16_to_cpu(desc->wMaxPacketSize);
+                        max_size = usb_endpoint_maxp(desc);
         }
 
         if (max_size == 0) {