From 4fc55f053e3e3b8115b11c6519e7ee2939dca1e2 Mon Sep 17 00:00:00 2001 From: Chihau Chau Date: Thu, 25 Feb 2010 20:20:09 -0300 Subject: [PATCH] --- yaml --- r: 186866 b: refs/heads/master c: b94c765ac31f8eb9c6fe895ba611bb446b799635 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/dream/camera/s5k3e2fx.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e445d221e6fd..6216174a3d12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df84f941e9370be6798fa11aa5a77396d8869fdc +refs/heads/master: b94c765ac31f8eb9c6fe895ba611bb446b799635 diff --git a/trunk/drivers/staging/dream/camera/s5k3e2fx.c b/trunk/drivers/staging/dream/camera/s5k3e2fx.c index edba19889b0f..2426f5e5b2aa 100644 --- a/trunk/drivers/staging/dream/camera/s5k3e2fx.c +++ b/trunk/drivers/staging/dream/camera/s5k3e2fx.c @@ -743,12 +743,12 @@ static int s5k3e2fx_sensor_open_init(const struct msm_camera_sensor_info *data) } /* initialize AF */ - if ((rc = s5k3e2fx_i2c_write_b(s5k3e2fx_client->addr, - 0x3146, 0x3A)) < 0) + rc = s5k3e2fx_i2c_write_b(s5k3e2fx_client->addr, 0x3146, 0x3A); + if (rc < 0) goto init_fail1; - if ((rc = s5k3e2fx_i2c_write_b(s5k3e2fx_client->addr, - 0x3130, 0x03)) < 0) + rc = s5k3e2fx_i2c_write_b(s5k3e2fx_client->addr, 0x3130, 0x03); + if (rc < 0) goto init_fail1; goto init_done;