diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-05 08:35:33 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-05 08:35:33 -0300 |
| commit | b6e32e956f7146fd7c85f3b7d83219c0c81f150d (patch) | |
| tree | 8826d5dfb9a46f966dd7a7a4e2ebc914c40ba8a7 /linux/drivers/media/video/au0828/au0828-core.c | |
| parent | 7e791201816fa3750dd804aab89a4ff0b93634a0 (diff) | |
| parent | 4ebd0d44965effc239d92927a43fcfc37e786d87 (diff) | |
| download | mediapointer-dvb-s2-b6e32e956f7146fd7c85f3b7d83219c0c81f150d.tar.gz mediapointer-dvb-s2-b6e32e956f7146fd7c85f3b7d83219c0c81f150d.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/au0828/au0828-core.c')
| -rw-r--r-- | linux/drivers/media/video/au0828/au0828-core.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/linux/drivers/media/video/au0828/au0828-core.c b/linux/drivers/media/video/au0828/au0828-core.c index ffe1bf019..ab25af430 100644 --- a/linux/drivers/media/video/au0828/au0828-core.c +++ b/linux/drivers/media/video/au0828/au0828-core.c @@ -37,8 +37,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 @@ -170,7 +168,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); @@ -198,10 +196,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__); |