diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-01 09:16:29 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-01 09:16:29 -0300 |
| commit | e2ee5810ab55b0e9b09089c60919f5ee5427387b (patch) | |
| tree | d67dd4ed47a498cb4ffb92afb1fb5a4fc2e9ddaf /linux/drivers/media/video/cx25840/cx25840-core.c | |
| parent | 0c98a2793c8c7ef5e2350bbe208d21e7bd5e6f8e (diff) | |
| parent | e7e951a35230e610d3bebb4e00168ecf8bc47760 (diff) | |
| download | mediapointer-dvb-s2-e2ee5810ab55b0e9b09089c60919f5ee5427387b.tar.gz mediapointer-dvb-s2-e2ee5810ab55b0e9b09089c60919f5ee5427387b.tar.bz2 | |
merge: http://linuxtv.org/hg/~mcisely/pvrusb2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx25840/cx25840-core.c')
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c index c401c1ee7..9d40a2b95 100644 --- a/linux/drivers/media/video/cx25840/cx25840-core.c +++ b/linux/drivers/media/video/cx25840/cx25840-core.c @@ -566,7 +566,7 @@ static int set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt) { struct v4l2_pix_format *pix; int HSC, VSC, Vsrc, Hsrc, filter, Vlines; - int is_pal = !(cx25840_get_v4lstd(client) & V4L2_STD_NTSC); + int is_50Hz = !(cx25840_get_v4lstd(client) & V4L2_STD_525_60); switch (fmt->type) { case V4L2_BUF_TYPE_VIDEO_CAPTURE: @@ -578,7 +578,7 @@ static int set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt) Hsrc = (cx25840_read(client, 0x472) & 0x3f) << 4; Hsrc |= (cx25840_read(client, 0x471) & 0xf0) >> 4; - Vlines = pix->height + (is_pal ? 4 : 7); + Vlines = pix->height + (is_50Hz ? 4 : 7); if ((pix->width * 16 < Hsrc) || (Hsrc < pix->width) || (Vlines * 8 < Vsrc) || (Vsrc < Vlines)) { |