From 79970cf8b0ded59314a7513ba8198cd3d1c172a1 Mon Sep 17 00:00:00 2001 From: Michael Grzeschik Date: Tue, 12 Jul 2011 12:39:03 -0300 Subject: [PATCH] --- yaml --- r: 261603 b: refs/heads/master c: 9c56cbf9aadff79c25ccd424ae422971efd5c1a4 h: refs/heads/master i: 261601: db70afe1dd18b5aa0bf4ece82158894a12e420bd 261599: edc0e6a07c5408ee317ab9da3d4667a6694078f3 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/mt9m111.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c980a873a308..bb5ccac977a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b52a851d9182e8a20704152d537c7e19ed34cc99 +refs/heads/master: 9c56cbf9aadff79c25ccd424ae422971efd5c1a4 diff --git a/trunk/drivers/media/video/mt9m111.c b/trunk/drivers/media/video/mt9m111.c index cbccc869c7e1..8d8420acc9cf 100644 --- a/trunk/drivers/media/video/mt9m111.c +++ b/trunk/drivers/media/video/mt9m111.c @@ -250,7 +250,9 @@ static int mt9m111_reg_clear(struct i2c_client *client, const u16 reg, int ret; ret = mt9m111_reg_read(client, reg); - return mt9m111_reg_write(client, reg, ret & ~data); + if (ret >= 0) + ret = mt9m111_reg_write(client, reg, ret & ~data); + return ret; } static int mt9m111_set_context(struct mt9m111 *mt9m111,