summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xarch/arm/plat-mxc/cpufreq.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/plat-mxc/cpufreq.c b/arch/arm/plat-mxc/cpufreq.c
index 304e5c7a523b..3d450e07d6a8 100755
--- a/arch/arm/plat-mxc/cpufreq.c
+++ b/arch/arm/plat-mxc/cpufreq.c
@@ -184,10 +184,13 @@ err4:
}
err3:
- ret = regulator_set_voltage(pu_regulator, org_pu_volt, org_pu_volt);
- if (ret < 0) {
- printk(KERN_ERR "COULD NOT RESTORE PU VOLTAGE!!!!\n");
- goto err3;
+ if (!IS_ERR(pu_regulator) &&
+ regulator_is_enabled(pu_regulator)) {
+ ret = regulator_set_voltage(pu_regulator, org_pu_volt, org_pu_volt);
+ if (ret < 0) {
+ printk(KERN_ERR "COULD NOT RESTORE PU VOLTAGE!!!!\n");
+ goto err3;
+ }
}
err2:
ret = regulator_set_voltage(soc_regulator, org_soc_volt,