Commit 2422de2c authored by Duncan Sands's avatar Duncan Sands Committed by Greg Kroah-Hartman

[PATCH] USB usbfs: fix up proc_ioctl

The semaphore is now taken in the caller.

 devio.c |    2 --
 1 files changed, 2 deletions(-)
parent fb6f56a6
...@@ -1139,7 +1139,6 @@ static int proc_ioctl (struct dev_state *ps, void __user *arg) ...@@ -1139,7 +1139,6 @@ static int proc_ioctl (struct dev_state *ps, void __user *arg)
return -ENODEV; return -ENODEV;
} }
down(&ps->dev->serialize);
if (ps->dev->state != USB_STATE_CONFIGURED) if (ps->dev->state != USB_STATE_CONFIGURED)
retval = -ENODEV; retval = -ENODEV;
else if (!(ifp = usb_ifnum_to_if (ps->dev, ctrl.ifno))) else if (!(ifp = usb_ifnum_to_if (ps->dev, ctrl.ifno)))
...@@ -1177,7 +1176,6 @@ static int proc_ioctl (struct dev_state *ps, void __user *arg) ...@@ -1177,7 +1176,6 @@ static int proc_ioctl (struct dev_state *ps, void __user *arg)
} }
up_read(&usb_bus_type.subsys.rwsem); up_read(&usb_bus_type.subsys.rwsem);
} }
up(&ps->dev->serialize);
/* cleanup and return */ /* cleanup and return */
if (retval >= 0 if (retval >= 0
......
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