From 60ae6ec767f0dea72680f731a1e7483ec77748a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Moine?= Date: Fri, 12 Nov 2010 15:32:29 -0300 Subject: [PATCH] --- yaml --- r: 226240 b: refs/heads/master c: 5927abcb21d0dd10c960517453e37302acf2269e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/ov519.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9b4b11fb9198..d0fd19f68917 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a23acec4bca79f2168a5aeacc8d85386b70ae522 +refs/heads/master: 5927abcb21d0dd10c960517453e37302acf2269e diff --git a/trunk/drivers/media/video/gspca/ov519.c b/trunk/drivers/media/video/gspca/ov519.c index 2484e5222d4a..43b86b1b57fb 100644 --- a/trunk/drivers/media/video/gspca/ov519.c +++ b/trunk/drivers/media/video/gspca/ov519.c @@ -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); @@ -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); @@ -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)