redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

V4L/DVB (11081): au0828: make sure v4l2_device name is unique

Browse source 
Make sure newly created v4l2 devices have a unique name, modeling the logic
after the cx18 driver.

Thanks to Andy Walls <awalls@radix.net> for pointing out the issue.

Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Devin Heitmueller 2009-03-11 21:58:04 -03:00 committed by Mauro Carvalho Chehab
parent b14667f32a
commit e13ce79734
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/media/video/au0828/au0828-core.c
View file

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