USB: legousbtower: make poll notice disconnect
authorOliver Neukum <oliver@neukum.org>
Thu, 2 Jul 2009 10:07:07 +0000 (12:07 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 23 Sep 2009 13:46:28 +0000 (06:46 -0700)
poll needs to return an error if a device is disconnected
  - make poll check for device's presence
  - wake all waiters in disconnect

Signed-off-by: Oliver Neukum <oliver@neukum.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/misc/legousbtower.c

index 97efeaec4d523a6c854084355117abc6ee6a6305..faa6d623de789ea5e6334e84651ba0675f852cf9 100644 (file)
@@ -552,6 +552,9 @@ static unsigned int tower_poll (struct file *file, poll_table *wait)
 
        dev = file->private_data;
 
+       if (!dev->udev)
+               return POLLERR | POLLHUP;
+
        poll_wait(file, &dev->read_wait, wait);
        poll_wait(file, &dev->write_wait, wait);
 
@@ -1025,6 +1028,9 @@ static void tower_disconnect (struct usb_interface *interface)
                tower_delete (dev);
        } else {
                dev->udev = NULL;
+               /* wake up pollers */
+               wake_up_interruptible_all(&dev->read_wait);
+               wake_up_interruptible_all(&dev->write_wait);
                mutex_unlock(&dev->lock);
        }