From 15bf45169268b09dcc38765ba82253e1602a9cd4 Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Sat, 2 Sep 2006 22:33:02 -0300 Subject: [PATCH] --- yaml --- r: 37454 b: refs/heads/master c: 22ebb77dfa94904f534563512b70178f98bbe962 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7115.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 14596f39c782..6bb2f7afeeff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f19d0278c86c7f27df287fd0bd5170fe75dc7d2 +refs/heads/master: 22ebb77dfa94904f534563512b70178f98bbe962 diff --git a/trunk/drivers/media/video/saa7115.c b/trunk/drivers/media/video/saa7115.c index 61642f83c957..4f61b972d680 100644 --- a/trunk/drivers/media/video/saa7115.c +++ b/trunk/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,