diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/cx88/cx88-core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-vbi.c | 4 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c index e1092d5d4628..2214235f76d3 100644 --- a/drivers/media/video/cx88/cx88-core.c +++ b/drivers/media/video/cx88/cx88-core.c | |||
@@ -677,7 +677,7 @@ static unsigned int inline norm_htotal(struct cx88_tvnorm *norm) | |||
677 | 677 | ||
678 | static unsigned int inline norm_vbipack(struct cx88_tvnorm *norm) | 678 | static unsigned int inline norm_vbipack(struct cx88_tvnorm *norm) |
679 | { | 679 | { |
680 | return (norm->id & V4L2_STD_625_50) ? 511 : 288; | 680 | return (norm->id & V4L2_STD_625_50) ? 511 : 400; |
681 | } | 681 | } |
682 | 682 | ||
683 | int cx88_set_scale(struct cx88_core *core, unsigned int width, unsigned int height, | 683 | int cx88_set_scale(struct cx88_core *core, unsigned int width, unsigned int height, |
diff --git a/drivers/media/video/cx88/cx88-vbi.c b/drivers/media/video/cx88/cx88-vbi.c index 846faadc9f1c..aa2a69770098 100644 --- a/drivers/media/video/cx88/cx88-vbi.c +++ b/drivers/media/video/cx88/cx88-vbi.c | |||
@@ -34,8 +34,8 @@ void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f) | |||
34 | if (dev->core->tvnorm->id & V4L2_STD_525_60) { | 34 | if (dev->core->tvnorm->id & V4L2_STD_525_60) { |
35 | /* ntsc */ | 35 | /* ntsc */ |
36 | f->fmt.vbi.sampling_rate = 28636363; | 36 | f->fmt.vbi.sampling_rate = 28636363; |
37 | f->fmt.vbi.start[0] = 10 -1; | 37 | f->fmt.vbi.start[0] = 10; |
38 | f->fmt.vbi.start[1] = 273 -1; | 38 | f->fmt.vbi.start[1] = 273; |
39 | 39 | ||
40 | } else if (dev->core->tvnorm->id & V4L2_STD_625_50) { | 40 | } else if (dev->core->tvnorm->id & V4L2_STD_625_50) { |
41 | /* pal */ | 41 | /* pal */ |
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index 84c87707203b..8413e54ef4b8 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | #include <linux/version.h> | 36 | #include <linux/version.h> |
37 | #include <linux/mutex.h> | 37 | #include <linux/mutex.h> |
38 | #define CX88_VERSION_CODE KERNEL_VERSION(0,0,5) | 38 | #define CX88_VERSION_CODE KERNEL_VERSION(0,0,6) |
39 | 39 | ||
40 | #ifndef TRUE | 40 | #ifndef TRUE |
41 | # define TRUE (1==1) | 41 | # define TRUE (1==1) |