From f7fa8bd798a03fdac45b430728742beeafd09863 Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Wed, 1 Apr 2009 08:41:13 -0300
Subject: [PATCH] --- yaml --- r: 142432 b: refs/heads/master c:
 6e7f7b37e719746da67ecfc54a264783d473ca05 h: refs/heads/master v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/media/video/cx231xx/cx231xx-cards.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 39077c054991..6af36889c144 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7231748af687819fa1699c80e64ed6b47a4a3ff0
+refs/heads/master: 6e7f7b37e719746da67ecfc54a264783d473ca05
diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-cards.c b/trunk/drivers/media/video/cx231xx/cx231xx-cards.c
index 1b30730b9fd8..79833c25e705 100644
--- a/trunk/drivers/media/video/cx231xx/cx231xx-cards.c
+++ b/trunk/drivers/media/video/cx231xx/cx231xx-cards.c
@@ -672,8 +672,6 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
 	 */
 
 	/* Create v4l2 device */
-	snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name),
-					"%s-%03d", "cx231xx", nr);
 	retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev);
 	if (retval) {
 		cx231xx_errdev("v4l2_device_register failed\n");