--- local_tree.orig/drivers/usb/core/devio.c 2004-07-25 15:03:40.103651192 +0200
+++ local_tree/drivers/usb/core/devio.c 2004-07-25 15:06:59.781312430 +0200
@@ -765,14 +765,22 @@
static int proc_setintf(struct dev_state *ps, void __user *arg)
{
struct usbdevfs_setinterface setintf;
+ struct usb_device *dev = ps->dev;
int ret;
if (copy_from_user(&setintf, arg, sizeof(setintf)))
return -EFAULT;
+ down(&dev->serialize);
+ if (!connected(dev)) {
+ ret = -ENODEV;
+ goto out;
+ }
if ((ret = checkintf(ps, setintf.interface)))
- return ret;
- return usb_set_interface(ps->dev, setintf.interface,
- setintf.altsetting);
+ goto out;
+ ret = usb_set_interface(dev, setintf.interface, setintf.altsetting);
+out:
+ up(&dev->serialize);
+ return ret;
}
static int proc_setconfig(struct dev_state *ps, void __user *arg)
@@ -1274,14 +1282,8 @@
break;
case USBDEVFS_SETINTERFACE:
- down(&dev->serialize);
- if (!connected(dev)) {
- up(&dev->serialize);
- return -ENODEV;
- }
snoop(&dev->dev, "%s: SETINTERFACE\n", __FUNCTION__);
ret = proc_setintf(ps, p);
- up(&dev->serialize);
break;
case USBDEVFS_SETCONFIGURATION:
-------------------------------------------------------
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
