From bfb8d816a6538bf35401fcc35d90129f8eec8389 Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Wed, 11 Mar 2009 21:58:04 -0300 Subject: [PATCH] --- yaml --- r: 138215 b: refs/heads/master c: e13ce79734348610a2b782cb818db65659b0dc83 h: refs/heads/master i: 138213: 06185387898b359ecc594a015055cb0bb2643326 138211: 71c2c7e1f096e2df0c25177edc101593b1fd50e8 138207: b484c1c6f3f3a0367d1b887b083fff68bb0998fb v: v3 --- [refs] | 2 +- trunk/drivers/media/video/au0828/au0828-core.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9375c6b16d3f..d18bbf633da7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b14667f32ad0f85f986847ef65f9f3d12a44b71a +refs/heads/master: e13ce79734348610a2b782cb818db65659b0dc83 diff --git a/trunk/drivers/media/video/au0828/au0828-core.c b/trunk/drivers/media/video/au0828/au0828-core.c index 3281a17fa2cd..8c761d164442 100644 --- a/trunk/drivers/media/video/au0828/au0828-core.c +++ b/trunk/drivers/media/video/au0828/au0828-core.c @@ -36,6 +36,8 @@ 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 @@ -167,7 +169,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; + int ifnum, retval, i; struct au0828_dev *dev; 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); /* Create the v4l2_device */ + i = atomic_inc_return(&au0828_instance) - 1; 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); if (retval) { printk(KERN_ERR "%s() v4l2_device_register failed\n",