diff options
-rw-r--r-- | drivers/media/video/saa7115.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c index 4f61b972d680..7ba3714bf2a0 100644 --- a/drivers/media/video/saa7115.c +++ b/drivers/media/video/saa7115.c | |||
@@ -48,7 +48,7 @@ | |||
48 | #include <media/saa7115.h> | 48 | #include <media/saa7115.h> |
49 | #include <asm/div64.h> | 49 | #include <asm/div64.h> |
50 | 50 | ||
51 | #define HRES_60HZ (480+16) | 51 | #define VRES_60HZ (480+16) |
52 | 52 | ||
53 | MODULE_DESCRIPTION("Philips SAA7111/SAA7113/SAA7114/SAA7115/SAA7118 video decoder driver"); | 53 | MODULE_DESCRIPTION("Philips SAA7111/SAA7113/SAA7114/SAA7115/SAA7118 video decoder driver"); |
54 | MODULE_AUTHOR( "Maxim Yevtyushkin, Kevin Thayer, Chris Kennedy, " | 54 | MODULE_AUTHOR( "Maxim Yevtyushkin, Kevin Thayer, Chris Kennedy, " |
@@ -332,8 +332,8 @@ static const unsigned char saa7115_cfg_60hz_video[] = { | |||
332 | R_C9_B_VERT_INPUT_WINDOW_START_MSB, 0x00, | 332 | R_C9_B_VERT_INPUT_WINDOW_START_MSB, 0x00, |
333 | 333 | ||
334 | /* vwindow length 0xf8 = 248 */ | 334 | /* vwindow length 0xf8 = 248 */ |
335 | R_CA_B_VERT_INPUT_WINDOW_LENGTH, HRES_60HZ>>1, | 335 | R_CA_B_VERT_INPUT_WINDOW_LENGTH, VRES_60HZ>>1, |
336 | R_CB_B_VERT_INPUT_WINDOW_LENGTH_MSB, HRES_60HZ>>9, | 336 | R_CB_B_VERT_INPUT_WINDOW_LENGTH_MSB, VRES_60HZ>>9, |
337 | 337 | ||
338 | /* hwindow 0x02d0 = 720 */ | 338 | /* hwindow 0x02d0 = 720 */ |
339 | R_CC_B_HORIZ_OUTPUT_WINDOW_LENGTH, 0xd0, | 339 | R_CC_B_HORIZ_OUTPUT_WINDOW_LENGTH, 0xd0, |
@@ -851,7 +851,7 @@ static int saa711x_set_size(struct i2c_client *client, int width, int height) | |||
851 | 851 | ||
852 | /* On 60Hz, it is using a higher Vertical Output Size */ | 852 | /* On 60Hz, it is using a higher Vertical Output Size */ |
853 | if (!is_50hz) | 853 | if (!is_50hz) |
854 | res+=(HRES_60HZ-480)>>1; | 854 | res+=(VRES_60HZ-480)>>1; |
855 | 855 | ||
856 | /* height */ | 856 | /* height */ |
857 | saa711x_write(client, R_CE_B_VERT_OUTPUT_WINDOW_LENGTH, | 857 | saa711x_write(client, R_CE_B_VERT_OUTPUT_WINDOW_LENGTH, |