Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 226240
b: refs/heads/master
c: 5927abc
h: refs/heads/master
v: v3
  • Loading branch information
Jean-François Moine authored and Mauro Carvalho Chehab committed Dec 29, 2010
1 parent 35a8a1a commit 60ae6ec
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 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: a23acec4bca79f2168a5aeacc8d85386b70ae522
refs/heads/master: 5927abcb21d0dd10c960517453e37302acf2269e
8 changes: 6 additions & 2 deletions trunk/drivers/media/video/gspca/ov519.c
Original file line number Diff line number Diff line change
Expand Up @@ -2325,6 +2325,8 @@ static inline void ov51x_stop(struct sd *sd)
break;
case BRIDGE_OV519:
reg_w(sd, OV519_R51_RESET1, 0x0f);
reg_w(sd, OV519_R51_RESET1, 0x00);
reg_w(sd, 0x22, 0x00); /* FRAR */
break;
case BRIDGE_OVFX2:
reg_w_mask(sd, 0x0f, 0x00, 0x02);
Expand Down Expand Up @@ -2356,7 +2358,9 @@ static inline void ov51x_restart(struct sd *sd)
reg_w(sd, R51x_SYS_RESET, 0x00);
break;
case BRIDGE_OV519:
reg_w(sd, OV519_R51_RESET1, 0x0f);
reg_w(sd, OV519_R51_RESET1, 0x00);
reg_w(sd, 0x22, 0x1d); /* FRAR */
break;
case BRIDGE_OVFX2:
reg_w_mask(sd, 0x0f, 0x02, 0x02);
Expand Down Expand Up @@ -3668,13 +3672,13 @@ static void sethvflip(struct gspca_dev *gspca_dev)
struct sd *sd = (struct sd *) gspca_dev;

if (sd->gspca_dev.streaming)
ov51x_stop(sd);
reg_w(sd, OV519_R51_RESET1, 0x0f); /* block stream */
i2c_w_mask(sd, OV7670_R1E_MVFP,
OV7670_MVFP_MIRROR * sd->ctrls[HFLIP].val
| OV7670_MVFP_VFLIP * sd->ctrls[VFLIP].val,
OV7670_MVFP_MIRROR | OV7670_MVFP_VFLIP);
if (sd->gspca_dev.streaming)
ov51x_restart(sd);
reg_w(sd, OV519_R51_RESET1, 0x00); /* restart stream */
}

static void set_ov_sensor_window(struct sd *sd)
Expand Down

0 comments on commit 60ae6ec

Please sign in to comment.