From: Mike Isely <isely@pobox.com>
Date: Sun, 3 Sep 2006 01:33:02 +0000 (-0300)
Subject: V4L/DVB (4596): Fix saa7115 miscalculation that breaks NTSC
X-Git-Tag: v2.6.19-rc1~643^2~32
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=22ebb77dfa94904f534563512b70178f98bbe962;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 61642f83c95..4f61b972d68 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,