summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/gspca
diff options
context:
space:
mode:
authorErik Andr?n <erik.andren@gmail.com>2008-12-30 11:47:11 +0100
committerErik Andr?n <erik.andren@gmail.com>2008-12-30 11:47:11 +0100
commitaaec9d2ce358856c524d13dc51b02d4cc01fba8a (patch)
tree698faa7ca31c6d1402cfdd15350b931bebfb5b96 /linux/drivers/media/video/gspca
parentc38361e834fd13184e9104b6a477081d032391b1 (diff)
downloadmediapointer-dvb-s2-aaec9d2ce358856c524d13dc51b02d4cc01fba8a.tar.gz
mediapointer-dvb-s2-aaec9d2ce358856c524d13dc51b02d4cc01fba8a.tar.bz2
gspca - m5602-ov9650: Always init the ov9650 before starting a stream
From: Erik Andr?n <erik.andren@gmail.com> This is a hack preventing a suspend-to-ram/disk regression. Priority: normal Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Diffstat (limited to 'linux/drivers/media/video/gspca')
-rw-r--r--linux/drivers/media/video/gspca/m5602/m5602_ov9650.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/linux/drivers/media/video/gspca/m5602/m5602_ov9650.c b/linux/drivers/media/video/gspca/m5602/m5602_ov9650.c
index ce4a1f0df..90f64e443 100644
--- a/linux/drivers/media/video/gspca/m5602/m5602_ov9650.c
+++ b/linux/drivers/media/video/gspca/m5602/m5602_ov9650.c
@@ -141,6 +141,7 @@ int ov9650_init(struct sd *sd)
data = 0x30;
err = m5602_write_sensor(sd, OV9650_MVFP, &data, 1);
}
+
return err;
}
@@ -149,6 +150,10 @@ int ov9650_start(struct sd *sd)
int i, err = 0;
struct cam *cam = &sd->gspca_dev.cam;
+ err = ov9650_init(sd);
+ if (err < 0)
+ return err;
+
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]);