Commit 349710c3 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman

usbfs: detect device unregistration

This patch (as711b) is a revised version of an earlier submission.  It
modifies the usbfs code to detect when a device has been unregistered from
usbfs, even if the device is still connected.  Although this can't happen
now, it will be able to happen after the upcoming changes to usb_generic.

Nobody objected to this patch when it was submitted before, so it should
be okay to apply this version.  The revision is merely to take into
account the changes introduced by as723, which touches the same driver.
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4a2a8a2c
...@@ -90,9 +90,10 @@ MODULE_PARM_DESC (usbfs_snoop, "true to log all usbfs traffic"); ...@@ -90,9 +90,10 @@ MODULE_PARM_DESC (usbfs_snoop, "true to log all usbfs traffic");
#define MAX_USBFS_BUFFER_SIZE 16384 #define MAX_USBFS_BUFFER_SIZE 16384
static inline int connected (struct usb_device *dev) static inline int connected (struct dev_state *ps)
{ {
return dev->state != USB_STATE_NOTATTACHED; return (!list_empty(&ps->list) &&
ps->dev->state != USB_STATE_NOTATTACHED);
} }
static loff_t usbdev_lseek(struct file *file, loff_t offset, int orig) static loff_t usbdev_lseek(struct file *file, loff_t offset, int orig)
...@@ -130,7 +131,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes, l ...@@ -130,7 +131,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes, l
pos = *ppos; pos = *ppos;
usb_lock_device(dev); usb_lock_device(dev);
if (!connected(dev)) { if (!connected(ps)) {
ret = -ENODEV; ret = -ENODEV;
goto err; goto err;
} else if (pos < 0) { } else if (pos < 0) {
...@@ -1326,7 +1327,7 @@ static int proc_ioctl(struct dev_state *ps, struct usbdevfs_ioctl *ctl) ...@@ -1326,7 +1327,7 @@ static int proc_ioctl(struct dev_state *ps, struct usbdevfs_ioctl *ctl)
} }
} }
if (!connected(ps->dev)) { if (!connected(ps)) {
kfree(buf); kfree(buf);
return -ENODEV; return -ENODEV;
} }
...@@ -1425,7 +1426,7 @@ static int usbdev_ioctl(struct inode *inode, struct file *file, unsigned int cmd ...@@ -1425,7 +1426,7 @@ static int usbdev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
if (!(file->f_mode & FMODE_WRITE)) if (!(file->f_mode & FMODE_WRITE))
return -EPERM; return -EPERM;
usb_lock_device(dev); usb_lock_device(dev);
if (!connected(dev)) { if (!connected(ps)) {
usb_unlock_device(dev); usb_unlock_device(dev);
return -ENODEV; return -ENODEV;
} }
...@@ -1566,7 +1567,7 @@ static unsigned int usbdev_poll(struct file *file, struct poll_table_struct *wai ...@@ -1566,7 +1567,7 @@ static unsigned int usbdev_poll(struct file *file, struct poll_table_struct *wai
poll_wait(file, &ps->wait, wait); poll_wait(file, &ps->wait, wait);
if (file->f_mode & FMODE_WRITE && !list_empty(&ps->async_completed)) if (file->f_mode & FMODE_WRITE && !list_empty(&ps->async_completed))
mask |= POLLOUT | POLLWRNORM; mask |= POLLOUT | POLLWRNORM;
if (!connected(ps->dev)) if (!connected(ps))
mask |= POLLERR | POLLHUP; mask |= POLLERR | POLLHUP;
return mask; return mask;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment