Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / drivers / usb / core / file.c

diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index 6b1b229e38cd1d28790d5f29e54eebbe3efe2fb8..997e659ff693eeb5ed083c2a8e76bdce76a33f97 100644 (file)
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -86,7 +86,7 @@ static int init_usb_class(void)
        usb_class->class = class_create(THIS_MODULE, "usb");
        if (IS_ERR(usb_class->class)) {
                result = IS_ERR(usb_class->class);
-               err("class_create failed for usb devices");
+               printk(KERN_ERR "class_create failed for usb devices\n");
                kfree(usb_class);
                usb_class = NULL;
        }
@@ -115,7 +115,8 @@ int usb_major_init(void)
 
        error = register_chrdev(USB_MAJOR, "usb", &usb_fops);
        if (error)
-               err("unable to get major %d for usb devices", USB_MAJOR);
+               printk(KERN_ERR "Unable to get major %d for usb devices\n",
+                      USB_MAJOR);
 
        return error;
 }
@@ -196,9 +197,9 @@ int usb_register_dev(struct usb_interface *intf,
                ++temp;
        else
                temp = name;
-       intf->usb_dev = device_create_drvdata(usb_class->class, &intf->dev,
-                                             MKDEV(USB_MAJOR, minor), NULL,
-                                             "%s", temp);
+       intf->usb_dev = device_create(usb_class->class, &intf->dev,
+                                     MKDEV(USB_MAJOR, minor), NULL,
+                                     "%s", temp);
        if (IS_ERR(intf->usb_dev)) {
                down_write(&minor_rwsem);
                usb_minors[intf->minor] = NULL;