]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
V4L/DVB: cx2341x: Report correct temporal setting for log-status
authorIan Armstrong <ian@iarmst.demon.co.uk>
Mon, 24 May 2010 00:56:33 +0000 (21:56 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 1 Jun 2010 04:24:31 +0000 (01:24 -0300)
[Andy Walls comment:] This patch from Ian removes the cx2341x module lying
about the setting of the temporal filter for the log status ioctl().

Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk>
Signed-off-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/cx2341x.c

index 022b480918cd0da8bfa4d2ccb9d4bb23c6001fb7..2bf44ef10fec2dfb870971535b6f21454ce609b9 100644 (file)
@@ -1113,7 +1113,6 @@ invalid:
 void cx2341x_log_status(const struct cx2341x_mpeg_params *p, const char *prefix)
 {
        int is_mpeg1 = p->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1;
-       int temporal = p->video_temporal_filter;
 
        /* Stream */
        printk(KERN_INFO "%s: Stream: %s",
@@ -1179,14 +1178,11 @@ void cx2341x_log_status(const struct cx2341x_mpeg_params *p, const char *prefix)
                    V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE),
                p->video_spatial_filter);
 
-       if (p->width != 720 || p->height != (p->is_50hz ? 576 : 480))
-               temporal = 0;
-
        printk(KERN_INFO "%s: Temporal Filter: %s, %d\n",
                prefix,
                cx2341x_menu_item(p,
                        V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE),
-               temporal);
+               p->video_temporal_filter);
        printk(KERN_INFO
                "%s: Median Filter:   %s, Luma [%d, %d], Chroma [%d, %d]\n",
                prefix,