From 83c98880e9ed99e18a48fb4484a42a4f13174bcf Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 18 Jul 2012 10:58:26 -0300 Subject: [PATCH] --- yaml --- r: 330874 b: refs/heads/master c: dc5d598219ed5e914ec139d8c82d0866cdb7b8ce h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/i2c/soc_camera/ov772x.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6b4d10497f66..9b9f13545bca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ead963009f295dc8589720d22fa4fb288be9edb +refs/heads/master: dc5d598219ed5e914ec139d8c82d0866cdb7b8ce diff --git a/trunk/drivers/media/i2c/soc_camera/ov772x.c b/trunk/drivers/media/i2c/soc_camera/ov772x.c index 76a80b652407..e4a10751894d 100644 --- a/trunk/drivers/media/i2c/soc_camera/ov772x.c +++ b/trunk/drivers/media/i2c/soc_camera/ov772x.c @@ -541,9 +541,15 @@ static int ov772x_mask_set(struct i2c_client *client, u8 command, u8 mask, static int ov772x_reset(struct i2c_client *client) { - int ret = ov772x_write(client, COM7, SCCB_RESET); + int ret; + + ret = ov772x_write(client, COM7, SCCB_RESET); + if (ret < 0) + return ret; + msleep(1); - return ret; + + return ov772x_mask_set(client, COM2, SOFT_SLEEP_MODE, SOFT_SLEEP_MODE); } /*