aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-06-24 12:14:14 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 16:53:12 -0400
commitae6db5154671759426046c2cbc2e20a82ff0feed (patch)
treeae18ddcd887dd3b978de912562946e94e212695a /drivers/media
parentb6dc1bab052891f7cbe158f7146a0f9d55806471 (diff)
[media] v4l2-ioctl: Add a default value for kernel version
Most drivers don't increase kernel versions as newer features are added or bug fixes are solved. So, vidioc_querycap returned value for cap->version is meaningless. Instead of keeping this situation forever, let's add a default value matching the current Linux version. Drivers that want to keep their own version control can still do it, as they can override the default value for cap->version. Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/v4l2-ioctl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 55df1436f835..48b94fcb6a25 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -16,6 +16,7 @@
16#include <linux/slab.h> 16#include <linux/slab.h>
17#include <linux/types.h> 17#include <linux/types.h>
18#include <linux/kernel.h> 18#include <linux/kernel.h>
19#include <linux/version.h>
19 20
20#include <linux/videodev2.h> 21#include <linux/videodev2.h>
21 22
@@ -605,6 +606,7 @@ static long __video_do_ioctl(struct file *file,
605 if (!ops->vidioc_querycap) 606 if (!ops->vidioc_querycap)
606 break; 607 break;
607 608
609 cap->version = LINUX_VERSION_CODE;
608 ret = ops->vidioc_querycap(file, fh, cap); 610 ret = ops->vidioc_querycap(file, fh, cap);
609 if (!ret) 611 if (!ret)
610 dbgarg(cmd, "driver=%s, card=%s, bus=%s, " 612 dbgarg(cmd, "driver=%s, card=%s, bus=%s, "