Commit f37aa511 authored by Andy Walls's avatar Andy Walls Committed by Mauro Carvalho Chehab

V4L/DVB (10443): cx18: Use correct line counts per field in firmware API call

The driver was incorrectly setting 0 line counts in a firmware
API call to set the maximum amount of lines per field.
Signed-off-by: default avatarAndy Walls <awalls@radix.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent dcc0ef88
...@@ -479,9 +479,6 @@ struct cx18 { ...@@ -479,9 +479,6 @@ struct cx18 {
unsigned long dualwatch_jiffies; unsigned long dualwatch_jiffies;
u32 dualwatch_stereo_mode; u32 dualwatch_stereo_mode;
/* Digitizer type */
int digitizer; /* 0x00EF = saa7114 0x00FO = saa7115 0x0106 = mic */
struct mutex serialize_lock; /* mutex used to serialize open/close/start/stop/ioctl operations */ struct mutex serialize_lock; /* mutex used to serialize open/close/start/stop/ioctl operations */
struct cx18_options options; /* User options */ struct cx18_options options; /* User options */
int stream_buffers[CX18_MAX_STREAMS]; /* # of buffers for each stream */ int stream_buffers[CX18_MAX_STREAMS]; /* # of buffers for each stream */
......
...@@ -548,10 +548,11 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s) ...@@ -548,10 +548,11 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)
/* /*
* Number of lines for Field 1 & Field 2 according to * Number of lines for Field 1 & Field 2 according to
* Documentation/video4linux/cx2341x/fw-encoder-api.txt * Documentation/video4linux/cx2341x/fw-encoder-api.txt
* FIXME - currently we set this to 0 & 0 but things seem OK * Field 1 is 312 for 625 line systems in BT.656
* Field 2 is 313 for 625 line systems in BT.656
*/ */
cx18_vapi(cx, CX18_CPU_SET_CAPTURE_LINE_NO, 3, cx18_vapi(cx, CX18_CPU_SET_CAPTURE_LINE_NO, 3,
s->handle, cx->digitizer, cx->digitizer); s->handle, 312, 313);
if (cx->v4l2_cap & V4L2_CAP_VBI_CAPTURE) if (cx->v4l2_cap & V4L2_CAP_VBI_CAPTURE)
cx18_vbi_setup(s); cx18_vbi_setup(s);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment