commit 5350ec2cff644cc6211a1ababa642b6d5f79b69e
author Linux Build Service Account <lnxbuild@localhost> Thu Jul 25 12:27:35 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jul 25 12:27:35 2013 -0700
tree fbf86b219b279c8c29480b40e34b52d180428b8e
parent 4422ca7dbf283b93de10a09317e52d441f183726
parent bcdd750f405f019a04461994bba159f1d7799ea0

Merge "msm: clock: Keep proper track of current voltage level"

arch/arm/mach-msm/clock.c

diff --git a/arch/arm/mach-msm/clock.c b/arch/arm/mach-msm/clock.c
index 527d73d..e3c11c5 100644
--- a/arch/arm/mach-msm/clock.c
+++ b/arch/arm/mach-msm/clock.c
@@ -90,16 +90,17 @@
 			continue;
 
 		rc = regulator_set_optimum_mode(r[i], ua[lvl_base + i]);
-		if (rc < 0)
+		rc = rc > 0 ? 0 : rc;
+		if (rc)
 			goto set_mode_fail;
 	}
 	if (vdd_class->set_vdd && !vdd_class->num_regulators)
 		rc = vdd_class->set_vdd(vdd_class, level);
 
-	if (rc < 0)
+	if (!rc)
 		vdd_class->cur_level = level;
 
-	return 0;
+	return rc;
 
 set_mode_fail:
 	regulator_set_voltage(r[i], uv[vdd_class->cur_level * n_reg + i],