diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-19 05:50:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-19 05:50:38 -0700 |
| commit | 50ee9339c7347c2b16fa79d43777f72e9f41ef5a (patch) | |
| tree | ce09aa147e5c8bb74c72c46cebfdbffeece6678f /drivers/usb/core/file.c | |
| parent | f0e615c3cb72b42191b558c130409335812621d8 (diff) | |
| parent | 98346f7db014614a4814eb60639f651f8bbc591d (diff) | |
| download | linux-50ee9339c7347c2b16fa79d43777f72e9f41ef5a.tar.bz2 | |
Merge 2.6.39-rc4 into usb-next
This is needed to help resolve some xhci issues and other minor
differences.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core/file.c')
| -rw-r--r-- | drivers/usb/core/file.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c index cf6a5423de09..99458c843d60 100644 --- a/drivers/usb/core/file.c +++ b/drivers/usb/core/file.c @@ -236,13 +236,6 @@ EXPORT_SYMBOL_GPL(usb_register_dev); void usb_deregister_dev(struct usb_interface *intf, struct usb_class_driver *class_driver) { - int minor_base = class_driver->minor_base; - char name[20]; - -#ifdef CONFIG_USB_DYNAMIC_MINORS - minor_base = 0; -#endif - if (intf->minor == -1) return; @@ -252,7 +245,6 @@ void usb_deregister_dev(struct usb_interface *intf, usb_minors[intf->minor] = NULL; up_write(&minor_rwsem); - snprintf(name, sizeof(name), class_driver->name, intf->minor - minor_base); device_destroy(usb_class->class, MKDEV(USB_MAJOR, intf->minor)); intf->usb_dev = NULL; intf->minor = -1; |