diff options
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/videodev.c | 6 | ||||
-rw-r--r-- | drivers/media/video/wm8775.c | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index 7df6a55dd59e..9a9902c56ae7 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c | |||
@@ -69,7 +69,7 @@ static void video_release(struct class_device *cd) | |||
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 | 71 | #if 1 |
72 | /* needed until all drivers are fixed */ | 72 | /* needed until all drivers are fixed */ |
73 | if (!vfd->release) | 73 | if (!vfd->release) |
74 | return; | 74 | return; |
75 | #endif | 75 | #endif |
@@ -339,11 +339,11 @@ int video_register_device(struct video_device *vfd, int type, int nr) | |||
339 | if (vfd->dev) | 339 | if (vfd->dev) |
340 | vfd->class_dev.dev = vfd->dev; | 340 | vfd->class_dev.dev = vfd->dev; |
341 | vfd->class_dev.class = &video_class; | 341 | vfd->class_dev.class = &video_class; |
342 | vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor); | 342 | vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor); |
343 | 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); |
344 | class_device_register(&vfd->class_dev); | 344 | class_device_register(&vfd->class_dev); |
345 | class_device_create_file(&vfd->class_dev, | 345 | class_device_create_file(&vfd->class_dev, |
346 | &class_device_attr_name); | 346 | &class_device_attr_name); |
347 | 347 | ||
348 | #if 1 | 348 | #if 1 |
349 | /* needed until all drivers are fixed */ | 349 | /* needed until all drivers are fixed */ |
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c index 3472f08e41fd..1933cd25b610 100644 --- a/drivers/media/video/wm8775.c +++ b/drivers/media/video/wm8775.c | |||
@@ -25,7 +25,6 @@ | |||
25 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 25 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | |||
29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
30 | #include <linux/types.h> | 29 | #include <linux/types.h> |
31 | #include <linux/ioctl.h> | 30 | #include <linux/ioctl.h> |