diff options
-rw-r--r-- | drivers/media/video/cx88/cx88-core.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c index 1ff79b5a8835..8c7f5589e92b 100644 --- a/drivers/media/video/cx88/cx88-core.c +++ b/drivers/media/video/cx88/cx88-core.c | |||
@@ -736,6 +736,10 @@ static unsigned int inline norm_fsc8(struct cx88_tvnorm *norm) | |||
736 | { | 736 | { |
737 | static const unsigned int ntsc = 28636360; | 737 | static const unsigned int ntsc = 28636360; |
738 | static const unsigned int pal = 35468950; | 738 | static const unsigned int pal = 35468950; |
739 | static const unsigned int palm = 28604892; | ||
740 | |||
741 | if (norm->id & V4L2_STD_PAL_M) | ||
742 | return palm; | ||
739 | 743 | ||
740 | return (norm->id & V4L2_STD_625_50) ? pal : ntsc; | 744 | return (norm->id & V4L2_STD_625_50) ? pal : ntsc; |
741 | } | 745 | } |
@@ -749,6 +753,11 @@ static unsigned int inline norm_notchfilter(struct cx88_tvnorm *norm) | |||
749 | 753 | ||
750 | static unsigned int inline norm_htotal(struct cx88_tvnorm *norm) | 754 | static unsigned int inline norm_htotal(struct cx88_tvnorm *norm) |
751 | { | 755 | { |
756 | /* Should always be Line Draw Time / (4*FSC) */ | ||
757 | |||
758 | if (norm->id & V4L2_STD_PAL_M) | ||
759 | return 909; | ||
760 | |||
752 | return (norm->id & V4L2_STD_625_50) ? 1135 : 910; | 761 | return (norm->id & V4L2_STD_625_50) ? 1135 : 910; |
753 | } | 762 | } |
754 | 763 | ||