From abbe8e891cb49ee3af46da96307a8b8d82995b2c Mon Sep 17 00:00:00 2001
From: Libor Pechacek <lpechacek@suse.cz>
Date: Fri, 25 Mar 2011 09:36:49 +0100
Subject: [PATCH] --- yaml --- r: 248708 b: refs/heads/master c:
 edf847decc4159128041d2a81f8d93e6eb567ecb h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/usb/core/file.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index fb120453e51d..f5fcc99da176 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 806e8f8fcc27e1753947bd9f059ba2316cf8f92a
+refs/heads/master: edf847decc4159128041d2a81f8d93e6eb567ecb
diff --git a/trunk/drivers/usb/core/file.c b/trunk/drivers/usb/core/file.c
index cf6a5423de09..99458c843d60 100644
--- a/trunk/drivers/usb/core/file.c
+++ b/trunk/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;