diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-23 06:31:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-29 17:22:30 -0300 |
| commit | 985bc96e27c729b8b686126ed26bba9fbaaf562d (patch) | |
| tree | 7a56baa3d895360cce47009ec8cbfc44574622c8 /drivers/media/video/videodev.c | |
| parent | f251d23eaee673524171b24a71a8794acf82783e (diff) | |
| download | op-kernel-dev-985bc96e27c729b8b686126ed26bba9fbaaf562d.zip op-kernel-dev-985bc96e27c729b8b686126ed26bba9fbaaf562d.tar.gz | |
V4L/DVB (4343): Fix for compilation without V4L1 or V4L1_COMPAT
Removed usage of HAVE_V4L1
Including videodev.h will just include videodev2.h if V4L1 is not supported
V4L1 code at core drivers will honor CONFIG_V4L1_COMPAT stuff
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/videodev.c')
| -rw-r--r-- | drivers/media/video/videodev.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index 4c3f926..5c52819 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c @@ -760,7 +760,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, ret=vfd->vidioc_overlay(file, fh, *i); break; } -#ifdef HAVE_V4L1 +#ifdef CONFIG_V4L1_COMPAT /* --- streaming capture ------------------------------------- */ case VIDIOCGMBUF: { @@ -1578,7 +1578,11 @@ int video_register_device(struct video_device *vfd, int type, int nr) __FUNCTION__); return ret; } - video_device_create_file(vfd, &class_device_attr_name); + ret = class_device_create_file(&vfd->class_dev, &class_device_attr_name); + if (ret < 0) { + printk(KERN_WARNING "%s error: %d\n", __FUNCTION__, ret); + return ret; + } #if 1 /* needed until all drivers are fixed */ |
