Also fixes all drivers that set this field.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/media/video/videodev.c | 3 +--
include/linux/videodev.h | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
--- gregkh-2.6.orig/drivers/media/video/videodev.c 2005-06-10 23:37:21.000000000 -0700
+++ gregkh-2.6/drivers/media/video/videodev.c 2005-06-10 23:37:23.000000000 -0700
@@ -336,8 +336,7 @@
vfd->class_dev.dev = vfd->dev;
vfd->class_dev.class = &video_class;
vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor);
- sprintf(vfd->devfs_name, "%s%d", name_base, i - base);
- strlcpy(vfd->class_dev.class_id, vfd->devfs_name, BUS_ID_SIZE);
+ sprintf(vfd->class_dev.class_id, "%s%d", name_base, i - base);
class_device_register(&vfd->class_dev);
class_device_create_file(&vfd->class_dev,
&class_device_attr_name);
--- gregkh-2.6.orig/include/linux/videodev.h 2005-06-10 23:28:58.000000000 -0700
+++ gregkh-2.6/include/linux/videodev.h 2005-06-10 23:37:23.000000000 -0700
@@ -42,7 +42,6 @@
/* for videodev.c intenal usage -- please don't touch */
int users; /* video_exclusive_{open|close} ... */
struct semaphore lock; /* ... helper function uses these */
- char devfs_name[64]; /* devfs */
struct class_device class_dev; /* sysfs */
};
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
