aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/cx18')
-rw-r--r--drivers/media/video/cx18/cx18-driver.h3
-rw-r--r--drivers/media/video/cx18/cx18-streams.c5
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index c9b6df50ab27..7fc914c521f7 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -479,9 +479,6 @@ struct cx18 {
479 unsigned long dualwatch_jiffies; 479 unsigned long dualwatch_jiffies;
480 u32 dualwatch_stereo_mode; 480 u32 dualwatch_stereo_mode;
481 481
482 /* Digitizer type */
483 int digitizer; /* 0x00EF = saa7114 0x00FO = saa7115 0x0106 = mic */
484
485 struct mutex serialize_lock; /* mutex used to serialize open/close/start/stop/ioctl operations */ 482 struct mutex serialize_lock; /* mutex used to serialize open/close/start/stop/ioctl operations */
486 struct cx18_options options; /* User options */ 483 struct cx18_options options; /* User options */
487 int stream_buffers[CX18_MAX_STREAMS]; /* # of buffers for each stream */ 484 int stream_buffers[CX18_MAX_STREAMS]; /* # of buffers for each stream */
diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c
index f074fdb29b8e..a8dcc0f171d1 100644
--- a/drivers/media/video/cx18/cx18-streams.c
+++ b/drivers/media/video/cx18/cx18-streams.c
@@ -548,10 +548,11 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)
548 /* 548 /*
549 * Number of lines for Field 1 & Field 2 according to 549 * Number of lines for Field 1 & Field 2 according to
550 * Documentation/video4linux/cx2341x/fw-encoder-api.txt 550 * Documentation/video4linux/cx2341x/fw-encoder-api.txt
551 * FIXME - currently we set this to 0 & 0 but things seem OK 551 * Field 1 is 312 for 625 line systems in BT.656
552 * Field 2 is 313 for 625 line systems in BT.656
552 */ 553 */
553 cx18_vapi(cx, CX18_CPU_SET_CAPTURE_LINE_NO, 3, 554 cx18_vapi(cx, CX18_CPU_SET_CAPTURE_LINE_NO, 3,
554 s->handle, cx->digitizer, cx->digitizer); 555 s->handle, 312, 313);
555 556
556 if (cx->v4l2_cap & V4L2_CAP_VBI_CAPTURE) 557 if (cx->v4l2_cap & V4L2_CAP_VBI_CAPTURE)
557 cx18_vbi_setup(s); 558 cx18_vbi_setup(s);