--- local_tree.orig/drivers/usb/core/devio.c 2004-07-25 14:50:11.447716542 +0200
+++ local_tree/drivers/usb/core/devio.c 2004-07-25 14:59:32.292267558 +0200
@@ -735,12 +735,17 @@
static int proc_connectinfo(struct dev_state *ps, void __user *arg)
{
struct usbdevfs_connectinfo ci;
+ struct usb_device *dev = ps->dev;
- ci.devnum = ps->dev->devnum;
- ci.slow = ps->dev->speed == USB_SPEED_LOW;
- if (copy_to_user(arg, &ci, sizeof(ci)))
- return -EFAULT;
- return 0;
+ down(&dev->serialize);
+ if (!connected(dev)) {
+ up(&dev->serialize);
+ return -ENODEV;
+ }
+ ci.devnum = dev->devnum;
+ ci.slow = dev->speed == USB_SPEED_LOW;
+ up(&dev->serialize);
+ return copy_to_user(arg, &ci, sizeof(ci)) ? -EFAULT : 0;
}
static int proc_resetdevice(struct dev_state *ps)
@@ -1262,14 +1267,8 @@
break;
case USBDEVFS_CONNECTINFO:
- down(&dev->serialize);
- if (!connected(dev)) {
- up(&dev->serialize);
- return -ENODEV;
- }
snoop(&dev->dev, "%s: CONNECTINFO\n", __FUNCTION__);
ret = proc_connectinfo(ps, p);
- up(&dev->serialize);
break;
case USBDEVFS_SETINTERFACE:
-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
