aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2009-11-12 04:13:41 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-05 15:41:50 -0500
commitc76e6f11662f49dd31a49a07f4c06ee9bea6572b (patch)
treeee2b95d158ed01655ab3e17e8c9fcc7897d64ca6 /drivers/media
parent69f1fe28f08000a123b3d71fac88564109da09fd (diff)
V4L/DVB (13425): gspca - ov534: Bad name of the ov965x 320x240 resolution.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/gspca/ov534.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c
index 548f9e7edd8c..f2f844af54c0 100644
--- a/drivers/media/video/gspca/ov534.c
+++ b/drivers/media/video/gspca/ov534.c
@@ -828,7 +828,7 @@ static const u8 bridge_start_ov965x_vga[][2] = {
828 {} 828 {}
829}; 829};
830 830
831static const u8 bridge_start_ov965x_cif[][2] = { 831static const u8 bridge_start_ov965x_qvga[][2] = {
832 {0xc2, 0x4c}, 832 {0xc2, 0x4c},
833 {0xc3, 0xf9}, 833 {0xc3, 0xf9},
834 {0xda, 0x00}, 834 {0xda, 0x00},
@@ -865,7 +865,7 @@ static const u8 sensor_start_ov965x_vga[][2] = {
865 {} 865 {}
866}; 866};
867 867
868static const u8 sensor_start_ov965x_cif[][2] = { 868static const u8 sensor_start_ov965x_qvga[][2] = {
869 {0x3b, 0xe4}, /* com11 - night mode 1/4 frame rate */ 869 {0x3b, 0xe4}, /* com11 - night mode 1/4 frame rate */
870 {0x1e, 0x04}, /* mvfp */ 870 {0x1e, 0x04}, /* mvfp */
871 {0x13, 0xe0}, /* com8 */ 871 {0x13, 0xe0}, /* com8 */
@@ -1359,10 +1359,10 @@ static int sd_start_ov965x(struct gspca_dev *gspca_dev)
1359 1359
1360 mode = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].priv; 1360 mode = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].priv;
1361 if (mode != 0) { /* 320x240 */ 1361 if (mode != 0) { /* 320x240 */
1362 reg_w_array(gspca_dev, bridge_start_ov965x_cif, 1362 reg_w_array(gspca_dev, bridge_start_ov965x_qvga,
1363 ARRAY_SIZE(bridge_start_ov965x_cif)); 1363 ARRAY_SIZE(bridge_start_ov965x_qvga));
1364 sccb_w_array(gspca_dev, sensor_start_ov965x_cif, 1364 sccb_w_array(gspca_dev, sensor_start_ov965x_qvga,
1365 ARRAY_SIZE(sensor_start_ov965x_cif)); 1365 ARRAY_SIZE(sensor_start_ov965x_qvga));
1366 } else { /* 640x480 */ 1366 } else { /* 640x480 */
1367 reg_w_array(gspca_dev, bridge_start_ov965x_vga, 1367 reg_w_array(gspca_dev, bridge_start_ov965x_vga,
1368 ARRAY_SIZE(bridge_start_ov965x_vga)); 1368 ARRAY_SIZE(bridge_start_ov965x_vga));