From bbb5027ffa8e43727b75be70ac005f9268aec323 Mon Sep 17 00:00:00 2001 From: Erik Andr?n Date: Tue, 30 Dec 2008 07:47:11 -0300 Subject: [PATCH] --- yaml --- r: 142476 b: refs/heads/master c: e335f224e35f413775a549889318afe6bd0342b0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/m5602/m5602_ov9650.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4003e52e22dd..02b55adc299c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d3ec926e98bc10c4c48ee7422aecdc335ab1222 +refs/heads/master: e335f224e35f413775a549889318afe6bd0342b0 diff --git a/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.c b/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.c index bbf91356096c..6581479c0b30 100644 --- a/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.c +++ b/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.c @@ -139,6 +139,7 @@ int ov9650_init(struct sd *sd) data = 0x30; err = m5602_write_sensor(sd, OV9650_MVFP, &data, 1); } + return err; } @@ -147,6 +148,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]);