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: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index c9b6df50ab27447625569f9d3b00e7aa6559bae7..7fc914c521f7cf22f42831ab79fc1021a5c1dfba 100644 (file)
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -479,9 +479,6 @@ struct cx18 {
        unsigned long dualwatch_jiffies;
        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 cx18_options options;    /* User options */
        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 f074fdb29b8eb37d6951fd127185d2958f3668d6..a8dcc0f171d1fa778974a75f19d94d63c96aeff0 100644 (file)
--- 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)
                /*
                 * Number of lines for Field 1 & Field 2 according to
                 * 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,
-                         s->handle, cx->digitizer, cx->digitizer);
+                         s->handle, 312, 313);
 
                if (cx->v4l2_cap & V4L2_CAP_VBI_CAPTURE)
                        cx18_vbi_setup(s);