ENGR00234411-2 CPUFREQ: fix one code bug on regulator restore when fail

Didn't care about pu_regulator is enabled or not when regulator restore if some
regulator set failed.

Signed-off-by: Robin Gong <b38343@freescale.com>

diff --git a/arch/arm/plat-mxc/cpufreq.c b/arch/arm/plat-mxc/cpufreq.c
index 304e5c7a523b79ab26cad878e32b37834f2c6ffc..3d450e07d6a836d7aea2cee52a7fa4fa6a420dbb 100755 (executable)
--- 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,