summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ov7670.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-14 11:37:46 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-14 11:37:46 +0200
commitd59fdcf2ac501de99c3dfb452af5e254d4342886 (patch)
treead5e2efd6f8aacf2a08b1ed8a54ddf96642e83f3 /drivers/media/video/ov7670.c
parent2387ce57a8167490d3b34a7e1ffa9a64a1a76244 (diff)
parentbce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff)
downloadkernel-crypto-d59fdcf2ac501de99c3dfb452af5e254d4342886.tar.gz
kernel-crypto-d59fdcf2ac501de99c3dfb452af5e254d4342886.tar.xz
kernel-crypto-d59fdcf2ac501de99c3dfb452af5e254d4342886.zip
Merge commit 'v2.6.26' into x86/core
Diffstat (limited to 'drivers/media/video/ov7670.c')
-rw-r--r--drivers/media/video/ov7670.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c
index 2bc6bdc9c1f..d7bfd30f74a 100644
--- a/drivers/media/video/ov7670.c
+++ b/drivers/media/video/ov7670.c
@@ -406,8 +406,10 @@ static int ov7670_read(struct i2c_client *c, unsigned char reg,
int ret;
ret = i2c_smbus_read_byte_data(c, reg);
- if (ret >= 0)
+ if (ret >= 0) {
*value = (unsigned char) ret;
+ ret = 0;
+ }
return ret;
}