From a9e9a6602d4ad20320cee50abb6568d03799e1a6 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 19 Jul 2006 11:43:17 -0300 Subject: [PATCH] devfs: Remove the videodevice devfs_name field as it's no longer needed From: Mauro Carvalho Chehab kernel-sync: backport from kernel to v4l/dvb tree Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/videodev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux/drivers') diff --git a/linux/drivers/media/video/videodev.c b/linux/drivers/media/video/videodev.c index f236bc6c7..7d0076a0f 100644 --- a/linux/drivers/media/video/videodev.c +++ b/linux/drivers/media/video/videodev.c @@ -1592,7 +1592,7 @@ int video_register_device(struct video_device *vfd, int type, int nr) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor); #endif - strlcpy(vfd->class_dev.class_id, vfd->devfs_name + 4, BUS_ID_SIZE); + sprintf(vfd->class_dev.class_id, "%s%d", name_base, i - base); ret = class_device_register(&vfd->class_dev); if (ret) { printk(KERN_ERR "%s: class_device_register failed\n", -- cgit v1.2.3