diff options
author | Ian Armstrong <ian@iarmst.demon.co.uk> | 2010-05-23 20:56:33 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-06-01 00:24:31 -0400 |
commit | 064a2485aa45956cf1e8520e716839e9d7555b90 (patch) | |
tree | e7a4bf6740effbd989bd52957a98e66488587fba | |
parent | 6afdeaf865b729287e02aafc61d8d013b89996ef (diff) |
V4L/DVB: cx2341x: Report correct temporal setting for log-status
[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>
-rw-r--r-- | drivers/media/video/cx2341x.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/video/cx2341x.c b/drivers/media/video/cx2341x.c index 022b480918cd..2bf44ef10fec 100644 --- a/drivers/media/video/cx2341x.c +++ b/drivers/media/video/cx2341x.c | |||
@@ -1113,7 +1113,6 @@ invalid: | |||
1113 | void cx2341x_log_status(const struct cx2341x_mpeg_params *p, const char *prefix) | 1113 | void cx2341x_log_status(const struct cx2341x_mpeg_params *p, const char *prefix) |
1114 | { | 1114 | { |
1115 | int is_mpeg1 = p->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1; | 1115 | int is_mpeg1 = p->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1; |
1116 | int temporal = p->video_temporal_filter; | ||
1117 | 1116 | ||
1118 | /* Stream */ | 1117 | /* Stream */ |
1119 | printk(KERN_INFO "%s: Stream: %s", | 1118 | printk(KERN_INFO "%s: Stream: %s", |
@@ -1179,14 +1178,11 @@ void cx2341x_log_status(const struct cx2341x_mpeg_params *p, const char *prefix) | |||
1179 | V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE), | 1178 | V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE), |
1180 | p->video_spatial_filter); | 1179 | p->video_spatial_filter); |
1181 | 1180 | ||
1182 | if (p->width != 720 || p->height != (p->is_50hz ? 576 : 480)) | ||
1183 | temporal = 0; | ||
1184 | |||
1185 | printk(KERN_INFO "%s: Temporal Filter: %s, %d\n", | 1181 | printk(KERN_INFO "%s: Temporal Filter: %s, %d\n", |
1186 | prefix, | 1182 | prefix, |
1187 | cx2341x_menu_item(p, | 1183 | cx2341x_menu_item(p, |
1188 | V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE), | 1184 | V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE), |
1189 | temporal); | 1185 | p->video_temporal_filter); |
1190 | printk(KERN_INFO | 1186 | printk(KERN_INFO |
1191 | "%s: Median Filter: %s, Luma [%d, %d], Chroma [%d, %d]\n", | 1187 | "%s: Median Filter: %s, Luma [%d, %d], Chroma [%d, %d]\n", |
1192 | prefix, | 1188 | prefix, |