diff options
Diffstat (limited to 'drivers/media/video/videodev.c')
-rw-r--r-- | drivers/media/video/videodev.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index 6de5b0094b82..9a9902c56ae7 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c | |||
@@ -68,7 +68,8 @@ static void video_release(struct class_device *cd) | |||
68 | { | 68 | { |
69 | struct video_device *vfd = container_of(cd, struct video_device, class_dev); | 69 | struct video_device *vfd = container_of(cd, struct video_device, class_dev); |
70 | 70 | ||
71 | #if 1 /* needed until all drivers are fixed */ | 71 | #if 1 |
72 | /* needed until all drivers are fixed */ | ||
72 | if (!vfd->release) | 73 | if (!vfd->release) |
73 | return; | 74 | return; |
74 | #endif | 75 | #endif |
@@ -338,13 +339,14 @@ int video_register_device(struct video_device *vfd, int type, int nr) | |||
338 | if (vfd->dev) | 339 | if (vfd->dev) |
339 | vfd->class_dev.dev = vfd->dev; | 340 | vfd->class_dev.dev = vfd->dev; |
340 | vfd->class_dev.class = &video_class; | 341 | vfd->class_dev.class = &video_class; |
341 | vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor); | 342 | vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor); |
342 | strlcpy(vfd->class_dev.class_id, vfd->devfs_name + 4, BUS_ID_SIZE); | 343 | strlcpy(vfd->class_dev.class_id, vfd->devfs_name + 4, BUS_ID_SIZE); |
343 | class_device_register(&vfd->class_dev); | 344 | class_device_register(&vfd->class_dev); |
344 | class_device_create_file(&vfd->class_dev, | 345 | class_device_create_file(&vfd->class_dev, |
345 | &class_device_attr_name); | 346 | &class_device_attr_name); |
346 | 347 | ||
347 | #if 1 /* needed until all drivers are fixed */ | 348 | #if 1 |
349 | /* needed until all drivers are fixed */ | ||
348 | if (!vfd->release) | 350 | if (!vfd->release) |
349 | printk(KERN_WARNING "videodev: \"%s\" has no release callback. " | 351 | printk(KERN_WARNING "videodev: \"%s\" has no release callback. " |
350 | "Please fix your driver for proper sysfs support, see " | 352 | "Please fix your driver for proper sysfs support, see " |