Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 142478
b: refs/heads/master
c: 4eecb17
h: refs/heads/master
v: v3
  • Loading branch information
Erik Andr?n authored and Mauro Carvalho Chehab committed Apr 7, 2009
1 parent c4ffb07 commit 188192b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e4cc4fcc7b85ec32f05343b02229492c06baba1a
refs/heads/master: 4eecb1767e0f1f800948eec9a3705c49a1b768aa
21 changes: 13 additions & 8 deletions trunk/drivers/media/video/gspca/m5602/m5602_ov9650.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,17 +154,18 @@ int ov9650_start(struct sd *sd)

for (i = 0; i < ARRAY_SIZE(res_init_ov9650) && !err; i++) {
if (res_init_ov9650[i][0] == BRIDGE)
err = m5602_write_bridge(sd, res_init_ov9650[i][1], res_init_ov9650[i][2]);
err = m5602_write_bridge(sd, res_init_ov9650[i][1],
res_init_ov9650[i][2]);
else if (res_init_ov9650[i][0] == SENSOR) {
u8 data = res_init_ov9650[i][2];
err = m5602_write_sensor(sd, res_init_ov9650[i][1], &data, 1);
err = m5602_write_sensor(sd,
res_init_ov9650[i][1], &data, 1);
}
}
if (err < 0)
return err;

switch (cam->cam_mode[sd->gspca_dev.curr_mode].width)
{
switch (cam->cam_mode[sd->gspca_dev.curr_mode].width) {
case 640:
PDEBUG(D_V4L2, "Configuring camera for VGA mode");

Expand All @@ -175,7 +176,8 @@ int ov9650_start(struct sd *sd)
err = m5602_write_sensor(sd,
VGA_ov9650[i][1], &data, 1);
} else {
err = m5602_write_bridge(sd, VGA_ov9650[i][1], VGA_ov9650[i][2]);
err = m5602_write_bridge(sd, VGA_ov9650[i][1],
VGA_ov9650[i][2]);
}
}
break;
Expand All @@ -190,7 +192,8 @@ int ov9650_start(struct sd *sd)
err = m5602_write_sensor(sd,
CIF_ov9650[i][1], &data, 1);
} else {
err = m5602_write_bridge(sd, CIF_ov9650[i][1], CIF_ov9650[i][2]);
err = m5602_write_bridge(sd, CIF_ov9650[i][1],
CIF_ov9650[i][2]);
}
}
break;
Expand All @@ -205,7 +208,8 @@ int ov9650_start(struct sd *sd)
err = m5602_write_sensor(sd,
QVGA_ov9650[i][1], &data, 1);
} else {
err = m5602_write_bridge(sd, QVGA_ov9650[i][1], QVGA_ov9650[i][2]);
err = m5602_write_bridge(sd, QVGA_ov9650[i][1],
QVGA_ov9650[i][2]);
}
}
break;
Expand All @@ -219,7 +223,8 @@ int ov9650_start(struct sd *sd)
err = m5602_write_sensor(sd,
QCIF_ov9650[i][1], &data, 1);
} else {
err = m5602_write_bridge(sd, QCIF_ov9650[i][1], QCIF_ov9650[i][2]);
err = m5602_write_bridge(sd, QCIF_ov9650[i][1],
QCIF_ov9650[i][2]);
}
}
break;
Expand Down

0 comments on commit 188192b

Please sign in to comment.