diff options
Diffstat (limited to 'drivers/usb/core/file.c')
-rw-r--r-- | drivers/usb/core/file.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c index c6a95395e52a..913fb8667899 100644 --- a/drivers/usb/core/file.c +++ b/drivers/usb/core/file.c | |||
@@ -150,7 +150,7 @@ int usb_register_dev(struct usb_interface *intf, | |||
150 | int retval = -EINVAL; | 150 | int retval = -EINVAL; |
151 | int minor_base = class_driver->minor_base; | 151 | int minor_base = class_driver->minor_base; |
152 | int minor = 0; | 152 | int minor = 0; |
153 | char name[BUS_ID_SIZE]; | 153 | char name[20]; |
154 | char *temp; | 154 | char *temp; |
155 | 155 | ||
156 | #ifdef CONFIG_USB_DYNAMIC_MINORS | 156 | #ifdef CONFIG_USB_DYNAMIC_MINORS |
@@ -190,9 +190,9 @@ int usb_register_dev(struct usb_interface *intf, | |||
190 | intf->minor = minor; | 190 | intf->minor = minor; |
191 | 191 | ||
192 | /* create a usb class device for this usb interface */ | 192 | /* create a usb class device for this usb interface */ |
193 | snprintf(name, BUS_ID_SIZE, class_driver->name, minor - minor_base); | 193 | snprintf(name, sizeof(name), class_driver->name, minor - minor_base); |
194 | temp = strrchr(name, '/'); | 194 | temp = strrchr(name, '/'); |
195 | if (temp && (temp[1] != 0x00)) | 195 | if (temp && (temp[1] != '\0')) |
196 | ++temp; | 196 | ++temp; |
197 | else | 197 | else |
198 | temp = name; | 198 | temp = name; |
@@ -227,7 +227,7 @@ void usb_deregister_dev(struct usb_interface *intf, | |||
227 | struct usb_class_driver *class_driver) | 227 | struct usb_class_driver *class_driver) |
228 | { | 228 | { |
229 | int minor_base = class_driver->minor_base; | 229 | int minor_base = class_driver->minor_base; |
230 | char name[BUS_ID_SIZE]; | 230 | char name[20]; |
231 | 231 | ||
232 | #ifdef CONFIG_USB_DYNAMIC_MINORS | 232 | #ifdef CONFIG_USB_DYNAMIC_MINORS |
233 | minor_base = 0; | 233 | minor_base = 0; |
@@ -242,7 +242,7 @@ void usb_deregister_dev(struct usb_interface *intf, | |||
242 | usb_minors[intf->minor] = NULL; | 242 | usb_minors[intf->minor] = NULL; |
243 | up_write(&minor_rwsem); | 243 | up_write(&minor_rwsem); |
244 | 244 | ||
245 | snprintf(name, BUS_ID_SIZE, class_driver->name, intf->minor - minor_base); | 245 | snprintf(name, sizeof(name), class_driver->name, intf->minor - minor_base); |
246 | device_destroy(usb_class->class, MKDEV(USB_MAJOR, intf->minor)); | 246 | device_destroy(usb_class->class, MKDEV(USB_MAJOR, intf->minor)); |
247 | intf->usb_dev = NULL; | 247 | intf->usb_dev = NULL; |
248 | intf->minor = -1; | 248 | intf->minor = -1; |