1 files changed, 31 insertions, 32 deletions

diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index 6303970e93c1..63e50a1f1396 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -130,7 +130,7 @@ MFG:HEWLETT-PACKARD;MDL:DESKJET 970C;CMD:MLC,PCL,PML;CLASS:PRINTER;DESCRIPTION:H
 
 struct usblp {
         struct usb_device       *dev;                   /* USB device */
-        struct semaphore        sem;                    /* locks this struct, especially "dev" */
+        struct mutex            mut;                    /* locks this struct, especially "dev" */
         char                    *writebuf;              /* write transfer_buffer */
         char                    *readbuf;               /* read transfer_buffer */
         char                    *statusbuf;             /* status transfer_buffer */
@@ -217,6 +217,7 @@ static const struct quirk_printer_struct quirk_printers[] = {
         { 0x0409, 0xbef4, USBLP_QUIRK_BIDIR }, /* NEC Picty760 (HP OEM) */
         { 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */
         { 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */
+        { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */
         { 0, 0 }
 };
 
@@ -397,6 +398,9 @@ static int usblp_open(struct inode *inode, struct file *file)
         retval = 0;
 #endif
 
+        retval = usb_autopm_get_interface(intf);
+        if (retval < 0)
+                goto out;
         usblp->used = 1;
         file->private_data = usblp;
 
@@ -441,6 +445,7 @@ static int usblp_release(struct inode *inode, struct file *file)
         usblp->used = 0;
         if (usblp->present) {
                 usblp_unlink_urbs(usblp);
+                usb_autopm_put_interface(usblp->intf);
         } else          /* finish cleanup from disconnect */
                 usblp_cleanup (usblp);
         mutex_unlock (&usblp_mutex);
@@ -465,7 +470,7 @@ static long usblp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         int twoints[2];
         int retval = 0;
 
-        down (&usblp->sem);
+        mutex_lock (&usblp->mut);
         if (!usblp->present) {
                 retval = -ENODEV;
                 goto done;
@@ -644,14 +649,14 @@ static long usblp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 }
 
 done:
-        up (&usblp->sem);
+        mutex_unlock (&usblp->mut);
         return retval;
 }
 
 static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
 {
         struct usblp *usblp = file->private_data;
-        int timeout, rv, err = 0, transfer_length = 0;
+        int timeout, intr, rv, err = 0, transfer_length = 0;
         size_t writecount = 0;
 
         while (writecount < count) {
@@ -668,14 +673,16 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
                         if (rv < 0)
                                 return writecount ? writecount : -EINTR;
                 }
-                down (&usblp->sem);
+                intr = mutex_lock_interruptible (&usblp->mut);
+                if (intr)
+                        return writecount ? writecount : -EINTR;
                 if (!usblp->present) {
-                        up (&usblp->sem);
+                        mutex_unlock (&usblp->mut);
                         return -ENODEV;
                 }
 
                 if (usblp->sleeping) {
-                        up (&usblp->sem);
+                        mutex_unlock (&usblp->mut);
                         return writecount ? writecount : -ENODEV;
                 }
 
@@ -687,10 +694,10 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
                                 err = usblp->writeurb->status;
                         } else
                                 err = usblp_check_status(usblp, err);
-                        up (&usblp->sem);
+                        mutex_unlock (&usblp->mut);
 
                         /* if the fault was due to disconnect, let khubd's
-                         * call to usblp_disconnect() grab usblp->sem ...
+                         * call to usblp_disconnect() grab usblp->mut ...
                          */
                         schedule ();
                         continue;
@@ -702,7 +709,7 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
                  */
                 writecount += transfer_length;
                 if (writecount == count) {
-                        up(&usblp->sem);
+                        mutex_unlock(&usblp->mut);
                         break;
                 }
 
@@ -714,7 +721,7 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
 
                 if (copy_from_user(usblp->writeurb->transfer_buffer, 
                                    buffer + writecount, transfer_length)) {
-                        up(&usblp->sem);
+                        mutex_unlock(&usblp->mut);
                         return writecount ? writecount : -EFAULT;
                 }
 
@@ -727,10 +734,10 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
                                 count = -EIO;
                         else
                                 count = writecount ? writecount : -ENOMEM;
-                        up (&usblp->sem);
+                        mutex_unlock (&usblp->mut);
                         break;
                 }
-                up (&usblp->sem);
+                mutex_unlock (&usblp->mut);
         }
 
         return count;
@@ -739,12 +746,14 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
 static ssize_t usblp_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
         struct usblp *usblp = file->private_data;
-        int rv;
+        int rv, intr;
 
         if (!usblp->bidir)
                 return -EINVAL;
 
-        down (&usblp->sem);
+        intr = mutex_lock_interruptible (&usblp->mut);
+        if (intr)
+                return -EINTR;
         if (!usblp->present) {
                 count = -ENODEV;
                 goto done;
@@ -757,9 +766,9 @@ static ssize_t usblp_read(struct file *file, char __user *buffer, size_t count,
                         count = -EAGAIN;
                         goto done;
                 }
-                up(&usblp->sem);
+                mutex_unlock(&usblp->mut);
                 rv = wait_event_interruptible(usblp->wait, usblp->rcomplete || !usblp->present);
-                down(&usblp->sem);
+                mutex_lock(&usblp->mut);
                 if (rv < 0) {
                         count = -EINTR;
                         goto done;
@@ -807,7 +816,7 @@ static ssize_t usblp_read(struct file *file, char __user *buffer, size_t count,
         }
 
 done:
-        up (&usblp->sem);
+        mutex_unlock (&usblp->mut);
         return count;
 }
 
@@ -886,7 +895,7 @@ static int usblp_probe(struct usb_interface *intf,
                 goto abort;
         }
         usblp->dev = dev;
-        init_MUTEX (&usblp->sem);
+        mutex_init (&usblp->mut);
         init_waitqueue_head(&usblp->wait);
         usblp->ifnum = intf->cur_altsetting->desc.bInterfaceNumber;
         usblp->intf = intf;
@@ -1178,7 +1187,7 @@ static void usblp_disconnect(struct usb_interface *intf)
         device_remove_file(&intf->dev, &dev_attr_ieee1284_id);
 
         mutex_lock (&usblp_mutex);
-        down (&usblp->sem);
+        mutex_lock (&usblp->mut);
         usblp->present = 0;
         usb_set_intfdata (intf, NULL);
 
@@ -1187,7 +1196,7 @@ static void usblp_disconnect(struct usb_interface *intf)
                         usblp->writebuf, usblp->writeurb->transfer_dma);
         usb_buffer_free (usblp->dev, USBLP_BUF_SIZE,
                         usblp->readbuf, usblp->readurb->transfer_dma);
-        up (&usblp->sem);
+        mutex_unlock (&usblp->mut);
 
         if (!usblp->used)
                 usblp_cleanup (usblp);
@@ -1198,14 +1207,9 @@ static int usblp_suspend (struct usb_interface *intf, pm_message_t message)
 {
         struct usblp *usblp = usb_get_intfdata (intf);
 
-        /* this races against normal access and open */
-        mutex_lock (&usblp_mutex);
-        down (&usblp->sem);
         /* we take no more IO */
         usblp->sleeping = 1;
         usblp_unlink_urbs(usblp);
-        up (&usblp->sem);
-        mutex_unlock (&usblp_mutex);
 
         return 0;
 }
@@ -1215,15 +1219,9 @@ static int usblp_resume (struct usb_interface *intf)
         struct usblp *usblp = usb_get_intfdata (intf);
         int r;
 
-        mutex_lock (&usblp_mutex);
-        down (&usblp->sem);
-
         usblp->sleeping = 0;
         r = handle_bidir (usblp);
 
-        up (&usblp->sem);
-        mutex_unlock (&usblp_mutex);
-
         return r;
 }
 
@@ -1246,6 +1244,7 @@ static struct usb_driver usblp_driver = {
         .suspend =      usblp_suspend,
         .resume =       usblp_resume,
         .id_table =     usblp_ids,
+        .supports_autosuspend = 1,
 };
 
 static int __init usblp_init(void)