Merge branch 'for-linus' of git://repo.or.cz/cris-mirror

[mv-sheeva.git] / drivers / usb / class / cdc-wdm.c

diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 0fe434505ac44d8d6d9c066738b36dacdd0c62ac..3e564bfe17d16b8673f26bdd32fc4da64e201fdc 100644 (file)
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -15,7 +15,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include <linux/smp_lock.h>
 #include <linux/mutex.h>
 #include <linux/uaccess.h>
 #include <linux/bitops.h>
@@ -314,8 +313,13 @@ static ssize_t wdm_write
        r = usb_autopm_get_interface(desc->intf);
        if (r < 0)
                goto outnp;
-       r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
-                                                          &desc->flags));
+
+       if (!file->f_flags && O_NONBLOCK)
+               r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
+                                                               &desc->flags));
+       else
+               if (test_bit(WDM_IN_USE, &desc->flags))
+                       r = -EAGAIN;
        if (r < 0)
                goto out;
 
@@ -378,7 +382,7 @@ outnl:
 static ssize_t wdm_read
 (struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
-       int rv, cntr;
+       int rv, cntr = 0;
        int i = 0;
        struct wdm_device *desc = file->private_data;
 
@@ -390,10 +394,23 @@ static ssize_t wdm_read
        if (desc->length == 0) {
                desc->read = 0;
 retry:
+               if (test_bit(WDM_DISCONNECTING, &desc->flags)) {
+                       rv = -ENODEV;
+                       goto err;
+               }
                i++;
-               rv = wait_event_interruptible(desc->wait,
-                                             test_bit(WDM_READ, &desc->flags));
+               if (file->f_flags & O_NONBLOCK) {
+                       if (!test_bit(WDM_READ, &desc->flags)) {
+                               rv = cntr ? cntr : -EAGAIN;
+                               goto err;
+                       }
+                       rv = 0;
+               } else {
+                       rv = wait_event_interruptible(desc->wait,
+                               test_bit(WDM_READ, &desc->flags));
+               }
 
+               /* may have happened while we slept */
                if (test_bit(WDM_DISCONNECTING, &desc->flags)) {
                        rv = -ENODEV;
                        goto err;
@@ -449,7 +466,7 @@ retry:
 
 err:
        mutex_unlock(&desc->rlock);
-       if (rv < 0)
+       if (rv < 0 && rv != -EAGAIN)
                dev_err(&desc->intf->dev, "wdm_read: exit error\n");
        return rv;
 }
@@ -507,8 +524,6 @@ static int wdm_open(struct inode *inode, struct file *file)
        desc = usb_get_intfdata(intf);
        if (test_bit(WDM_DISCONNECTING, &desc->flags))
                goto out;
-
-       ;
        file->private_data = desc;
 
        rv = usb_autopm_get_interface(desc->intf);