diff options
Diffstat (limited to 'drivers/media/video/saa7115.c')
-rw-r--r-- | drivers/media/video/saa7115.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c index f28398dd9d93..c2374ed7ba9f 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) | |||
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+=(VRES_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, |
@@ -907,7 +907,7 @@ static int saa711x_set_size(struct i2c_client *client, int width, int height) | |||
907 | 907 | ||
908 | /* Activates task "B" */ | 908 | /* Activates task "B" */ |
909 | saa711x_write(client, R_80_GLOBAL_CNTL_1, | 909 | saa711x_write(client, R_80_GLOBAL_CNTL_1, |
910 | saa711x_read(client,R_80_GLOBAL_CNTL_1)|0x20); | 910 | saa711x_read(client,R_80_GLOBAL_CNTL_1) | 0x20); |
911 | 911 | ||
912 | return 0; | 912 | return 0; |
913 | } | 913 | } |
@@ -932,11 +932,11 @@ static void saa711x_set_v4lstd(struct i2c_client *client, v4l2_std_id std) | |||
932 | if (std & V4L2_STD_525_60) { | 932 | if (std & V4L2_STD_525_60) { |
933 | v4l_dbg(1, debug, client, "decoder set standard 60 Hz\n"); | 933 | v4l_dbg(1, debug, client, "decoder set standard 60 Hz\n"); |
934 | saa711x_writeregs(client, saa7115_cfg_60hz_video); | 934 | saa711x_writeregs(client, saa7115_cfg_60hz_video); |
935 | saa711x_set_size(client,720,480); | 935 | saa711x_set_size(client, 720, 480); |
936 | } else { | 936 | } else { |
937 | v4l_dbg(1, debug, client, "decoder set standard 50 Hz\n"); | 937 | v4l_dbg(1, debug, client, "decoder set standard 50 Hz\n"); |
938 | saa711x_writeregs(client, saa7115_cfg_50hz_video); | 938 | saa711x_writeregs(client, saa7115_cfg_50hz_video); |
939 | saa711x_set_size(client,720,576); | 939 | saa711x_set_size(client, 720, 576); |
940 | } | 940 | } |
941 | 941 | ||
942 | /* Register 0E - Bits D6-D4 on NO-AUTO mode | 942 | /* Register 0E - Bits D6-D4 on NO-AUTO mode |
@@ -1464,13 +1464,13 @@ static int saa711x_attach(struct i2c_adapter *adapter, int address, int kind) | |||
1464 | client->driver = &i2c_driver_saa711x; | 1464 | client->driver = &i2c_driver_saa711x; |
1465 | snprintf(client->name, sizeof(client->name) - 1, "saa7115"); | 1465 | snprintf(client->name, sizeof(client->name) - 1, "saa7115"); |
1466 | 1466 | ||
1467 | for (i=0;i<0x0f;i++) { | 1467 | for (i = 0; i < 0x0f; i++) { |
1468 | saa711x_write(client, 0, i); | 1468 | saa711x_write(client, 0, i); |
1469 | name[i] = (saa711x_read(client, 0) &0x0f) +'0'; | 1469 | name[i] = (saa711x_read(client, 0) & 0x0f) + '0'; |
1470 | if (name[i]>'9') | 1470 | if (name[i] > '9') |
1471 | name[i]+='a'-'9'-1; | 1471 | name[i] += 'a' - '9' - 1; |
1472 | } | 1472 | } |
1473 | name[i]='\0'; | 1473 | name[i] = '\0'; |
1474 | 1474 | ||
1475 | saa711x_write(client, 0, 5); | 1475 | saa711x_write(client, 0, 5); |
1476 | chip_id = saa711x_read(client, 0) & 0x0f; | 1476 | chip_id = saa711x_read(client, 0) & 0x0f; |