From 8a58242b20732dc3a27d2b0d696aed5f3783c639 Mon Sep 17 00:00:00 2001 From: Servaas Vandenberghe Date: Sun, 29 Apr 2007 16:27:30 -0300 Subject: [PATCH] --- yaml --- r: 56059 b: refs/heads/master c: ba70d59bb987110c4394e896b299f9726609aa33 h: refs/heads/master i: 56057: ba338e6d45c61c83c53411e9b09bce37ba59fcef 56055: e91cd55d93819abc4037cd0dbf0ab8c11b9af7b7 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx25840/cx25840-core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2775dc75133d..19f62976cd3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c808e641741ecd7a7d5e65e38f740378d7406fc +refs/heads/master: ba70d59bb987110c4394e896b299f9726609aa33 diff --git a/trunk/drivers/media/video/cx25840/cx25840-core.c b/trunk/drivers/media/video/cx25840/cx25840-core.c index 1757a588970f..67bda9f9a44b 100644 --- a/trunk/drivers/media/video/cx25840/cx25840-core.c +++ b/trunk/drivers/media/video/cx25840/cx25840-core.c @@ -555,7 +555,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: @@ -567,7 +567,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)) {