Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / media / video / au0828 / au0828-core.c

diff --git a/drivers/media/video/au0828/au0828-core.c b/drivers/media/video/au0828/au0828-core.c
index 8c761d1644420fa164108b1421ff314e636ca66e..4cee0b92eeee31b9f9b39d09c308b14da3ef613e 100644 (file)
--- a/drivers/media/video/au0828/au0828-core.c
+++ b/drivers/media/video/au0828/au0828-core.c
@@ -36,8 +36,6 @@ int au0828_debug;
 module_param_named(debug, au0828_debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable debug messages");
 
-static atomic_t au0828_instance = ATOMIC_INIT(0);
-
 #define _AU0828_BULKPIPE 0x03
 #define _BULKPIPESIZE 0xffff
 
@@ -169,7 +167,7 @@ static void au0828_usb_disconnect(struct usb_interface *interface)
 static int au0828_usb_probe(struct usb_interface *interface,
        const struct usb_device_id *id)
 {
-       int ifnum, retval, i;
+       int ifnum, retval;
        struct au0828_dev *dev;
        struct usb_device *usbdev = interface_to_usbdev(interface);
 
@@ -197,10 +195,7 @@ static int au0828_usb_probe(struct usb_interface *interface,
        usb_set_intfdata(interface, dev);
 
        /* Create the v4l2_device */
-       i = atomic_inc_return(&au0828_instance) - 1;
-       snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name), "%s-%03d",
-                "au0828", i);
-       retval = v4l2_device_register(&dev->usbdev->dev, &dev->v4l2_dev);
+       retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev);
        if (retval) {
                printk(KERN_ERR "%s() v4l2_device_register failed\n",
                       __func__);