diff options
-rw-r--r-- | drivers/media/video/cx88/cx88-core.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c index 241cabfadeeb..4b655f2ef278 100644 --- a/drivers/media/video/cx88/cx88-core.c +++ b/drivers/media/video/cx88/cx88-core.c | |||
@@ -658,11 +658,6 @@ static unsigned int inline norm_fsc8(struct cx88_tvnorm *norm) | |||
658 | return (norm->id & V4L2_STD_625_50) ? pal : ntsc; | 658 | return (norm->id & V4L2_STD_625_50) ? pal : ntsc; |
659 | } | 659 | } |
660 | 660 | ||
661 | static unsigned int inline norm_notchfilter(struct cx88_tvnorm *norm) | ||
662 | { | ||
663 | return HLNotchFilter4xFsc; | ||
664 | } | ||
665 | |||
666 | static unsigned int inline norm_htotal(struct cx88_tvnorm *norm) | 661 | static unsigned int inline norm_htotal(struct cx88_tvnorm *norm) |
667 | { | 662 | { |
668 | /* Should always be Line Draw Time / (4*FSC) */ | 663 | /* Should always be Line Draw Time / (4*FSC) */ |
@@ -935,7 +930,7 @@ int cx88_set_tvnorm(struct cx88_core *core, struct cx88_tvnorm *norm) | |||
935 | // htotal | 930 | // htotal |
936 | tmp64 = norm_htotal(norm) * (u64)vdec_clock; | 931 | tmp64 = norm_htotal(norm) * (u64)vdec_clock; |
937 | do_div(tmp64, fsc8); | 932 | do_div(tmp64, fsc8); |
938 | htotal = (u32)tmp64 | (norm_notchfilter(norm) << 11); | 933 | htotal = (u32)tmp64 | (HLNotchFilter4xFsc << 11); |
939 | dprintk(1,"set_tvnorm: MO_HTOTAL 0x%08x [old=0x%08x,htotal=%d]\n", | 934 | dprintk(1,"set_tvnorm: MO_HTOTAL 0x%08x [old=0x%08x,htotal=%d]\n", |
940 | htotal, cx_read(MO_HTOTAL), (u32)tmp64); | 935 | htotal, cx_read(MO_HTOTAL), (u32)tmp64); |
941 | cx_write(MO_HTOTAL, htotal); | 936 | cx_write(MO_HTOTAL, htotal); |