diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-06-21 11:02:36 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-06-21 11:02:36 +0200 |
| commit | 41951ee0d067ea4a4175ee933d993bbed9a258a2 (patch) | |
| tree | 99fcfb62e9c263a499ad33f1c8e058b99f04ea41 /linux/drivers/media/video/cx18 | |
| parent | 20086b387b880f279de1671dfb6b12b72849193e (diff) | |
| download | mediapointer-dvb-s2-41951ee0d067ea4a4175ee933d993bbed9a258a2.tar.gz mediapointer-dvb-s2-41951ee0d067ea4a4175ee933d993bbed9a258a2.tar.bz2 | |
ivtv/cx18: remove unnecessary memsets & KERNEL_VERSION tests
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx18')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-ioctl.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-ioctl.c b/linux/drivers/media/video/cx18/cx18-ioctl.c index f804890f7..2dea6b676 100644 --- a/linux/drivers/media/video/cx18/cx18-ioctl.c +++ b/linux/drivers/media/video/cx18/cx18-ioctl.c @@ -750,19 +750,10 @@ static int cx18_g_sliced_vbi_cap(struct file *file, void *fh, struct cx18 *cx = ((struct cx18_open_id *)fh)->cx; int set = cx->is_50hz ? V4L2_SLICED_VBI_625 : V4L2_SLICED_VBI_525; int f, l; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) - enum v4l2_buf_type type = cap->type; -#else - enum v4l2_buf_type type = VIDIOC_G_SLICED_VBI_CAP; -#endif CX18_DEBUG_IOCTL("VIDIOC_G_SLICED_VBI_CAP\n"); - memset(cap, 0, sizeof(*cap)); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) - cap->type = type; -#endif - if (type == V4L2_BUF_TYPE_SLICED_VBI_CAPTURE) { + if (cap->type == V4L2_BUF_TYPE_SLICED_VBI_CAPTURE) { for (f = 0; f < 2; f++) { for (l = 0; l < 24; l++) { if (valid_service_line(f, l, cx->is_50hz)) @@ -808,8 +799,6 @@ static int cx18_encoder_cmd(struct file *file, void *fh, CX18_DEBUG_IOCTL("VIDIOC_ENCODER_CMD:\n"); - memset(&enc->raw, 0, sizeof(enc->raw)); - switch (enc->cmd) { case V4L2_ENC_CMD_START: CX18_DEBUG_IOCTL("V4L2_ENC_CMD_START\n"); @@ -859,8 +848,6 @@ static int cx18_try_encoder_cmd(struct file *file, void *fh, CX18_DEBUG_IOCTL("VIDIOC_TRY_ENCDOER_CMD:\n"); - memset(&enc->raw, 0, sizeof(enc->raw)); - switch (enc->cmd) { case V4L2_ENC_CMD_START: CX18_DEBUG_IOCTL("V4L2_ENC_CMD_START\n"); |