diff options
author | Jeff Garzik | 2005-10-29 03:32:01 +0200 |
---|---|---|
committer | Jeff Garzik | 2005-10-29 03:32:01 +0200 |
commit | 5615ca7906aefbdc3318604c89db5931d0a25910 (patch) | |
tree | c34bcc7e314f49005ad88ac84c908128729c0329 /drivers/usb/core/file.c | |
parent | Merge branch 'master' (diff) | |
parent | Merge branch 'master' (diff) | |
download | kernel-qcow2-linux-5615ca7906aefbdc3318604c89db5931d0a25910.tar.gz kernel-qcow2-linux-5615ca7906aefbdc3318604c89db5931d0a25910.tar.xz kernel-qcow2-linux-5615ca7906aefbdc3318604c89db5931d0a25910.zip |
Merge branch 'upstream'
Diffstat (limited to 'drivers/usb/core/file.c')
-rw-r--r-- | drivers/usb/core/file.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c index 65ca131cc44c..78cb4be9529f 100644 --- a/drivers/usb/core/file.c +++ b/drivers/usb/core/file.c @@ -172,7 +172,9 @@ int usb_register_dev(struct usb_interface *intf, ++temp; else temp = name; - intf->class_dev = class_device_create(usb_class, MKDEV(USB_MAJOR, minor), &intf->dev, "%s", temp); + intf->class_dev = class_device_create(usb_class, NULL, + MKDEV(USB_MAJOR, minor), + &intf->dev, "%s", temp); if (IS_ERR(intf->class_dev)) { spin_lock (&minor_lock); usb_minors[intf->minor] = NULL; |