Skip to content

Commit

Permalink
Revert "USB: usb-skeleton.c: fix open/disconnect race"
Browse files Browse the repository at this point in the history
This reverts commit 26c71a7.

It's not needed, to quote Ming Lei:
	Looks you have queued the patch into your tree, but just now I
	find the patch is not needed at all, since we have had
	minor_rwsem(drivers/usb/core/file.c) for this purpose, please
	drop the patch, sorry for it.

Cc: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed Jan 24, 2012
1 parent d1620ca commit 52a7499
Showing 1 changed file with 1 addition and 17 deletions.
18 changes: 1 addition & 17 deletions drivers/usb/usb-skeleton.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
#define USB_SKEL_VENDOR_ID 0xfff0
#define USB_SKEL_PRODUCT_ID 0xfff0

static DEFINE_MUTEX(skel_mutex);

/* table of devices that work with this driver */
static const struct usb_device_id skel_table[] = {
{ USB_DEVICE(USB_SKEL_VENDOR_ID, USB_SKEL_PRODUCT_ID) },
Expand Down Expand Up @@ -101,37 +99,26 @@ static int skel_open(struct inode *inode, struct file *file)
goto exit;
}

mutex_lock(&skel_mutex);
dev = usb_get_intfdata(interface);
if (!dev) {
mutex_unlock(&skel_mutex);
retval = -ENODEV;
goto exit;
}

/* increment our usage count for the device */
kref_get(&dev->kref);
mutex_unlock(&skel_mutex);

/* lock the device to allow correctly handling errors
* in resumption */
mutex_lock(&dev->io_mutex);
if (!dev->interface) {
retval = -ENODEV;
goto out_err;
}

retval = usb_autopm_get_interface(interface);
if (retval)
goto out_err;

/* save our object in the file's private structure */
file->private_data = dev;

out_err:
mutex_unlock(&dev->io_mutex);
if (retval)
kref_put(&dev->kref, skel_delete);

exit:
return retval;
Expand Down Expand Up @@ -611,6 +598,7 @@ static void skel_disconnect(struct usb_interface *interface)
int minor = interface->minor;

dev = usb_get_intfdata(interface);
usb_set_intfdata(interface, NULL);

/* give back our minor */
usb_deregister_dev(interface, &skel_class);
Expand All @@ -622,12 +610,8 @@ static void skel_disconnect(struct usb_interface *interface)

usb_kill_anchored_urbs(&dev->submitted);

mutex_lock(&skel_mutex);
usb_set_intfdata(interface, NULL);

/* decrement our usage count */
kref_put(&dev->kref, skel_delete);
mutex_unlock(&skel_mutex);

dev_info(&interface->dev, "USB Skeleton #%d now disconnected", minor);
}
Expand Down

0 comments on commit 52a7499

Please sign in to comment.