summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2006-09-02 22:33:02 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 12:30:35 -0300
commit22ebb77dfa94904f534563512b70178f98bbe962 (patch)
tree305e0c1e37c738a67c5d8dee5e7a70058d23a08d /drivers
parent7f19d0278c86c7f27df287fd0bd5170fe75dc7d2 (diff)
downloadop-kernel-dev-22ebb77dfa94904f534563512b70178f98bbe962.zip
op-kernel-dev-22ebb77dfa94904f534563512b70178f98bbe962.tar.gz
V4L/DVB (4596): Fix saa7115 miscalculation that breaks NTSC
This repairs a problem introduced by a commit earlier applied. Thanks-to: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/saa7115.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 61642f8..4f61b97 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -851,7 +851,7 @@ static int saa711x_set_size(struct i2c_client *client, int width, int height)
/* On 60Hz, it is using a higher Vertical Output Size */
if (!is_50hz)
- res+=(480-HRES_60HZ)>>1;
+ res+=(HRES_60HZ-480)>>1;
/* height */
saa711x_write(client, R_CE_B_VERT_OUTPUT_WINDOW_LENGTH,
OpenPOWER on IntegriCloud