aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-02-07 09:00:02 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:42:41 -0400
commit80b36e0fcfe7520ee92f648148d091ad880ae711 (patch)
tree5a28d5f895852bcd4cb7b9849dc2932dc2929034 /drivers/media/video
parent89aec3e1baaddeaa5636487f0e23f807eb758168 (diff)
V4L/DVB (10490): v4l2: prefill ident and revision from v4l2_dbg_chip_ident.
Drivers that implement this always have to set the ident and revision to V4L2_IDENT_NONE and 0. Do this in the v4l2 core so drivers don't have to do this. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/v4l2-ioctl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 52d687b165e0..20a571f21577 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -24,6 +24,7 @@
24#endif 24#endif
25#include <media/v4l2-common.h> 25#include <media/v4l2-common.h>
26#include <media/v4l2-ioctl.h> 26#include <media/v4l2-ioctl.h>
27#include <media/v4l2-chip-ident.h>
27#include <linux/video_decoder.h> 28#include <linux/video_decoder.h>
28 29
29#define dbgarg(cmd, fmt, arg...) \ 30#define dbgarg(cmd, fmt, arg...) \
@@ -1745,6 +1746,8 @@ static long __video_do_ioctl(struct file *file,
1745 1746
1746 if (!ops->vidioc_g_chip_ident) 1747 if (!ops->vidioc_g_chip_ident)
1747 break; 1748 break;
1749 p->ident = V4L2_IDENT_NONE;
1750 p->revision = 0;
1748 ret = ops->vidioc_g_chip_ident(file, fh, p); 1751 ret = ops->vidioc_g_chip_ident(file, fh, p);
1749 if (!ret) 1752 if (!ret)
1750 dbgarg(cmd, "chip_ident=%u, revision=0x%x\n", p->ident, p->revision); 1753 dbgarg(cmd, "chip_ident=%u, revision=0x%x\n", p->ident, p->revision);