Merge branches 'clk-of-refcount', 'clk-mmio-fixed-clock', 'clk-remove-clps', 'clk...

[linux-2.6-block.git] / drivers / cpufreq / imx6q-cpufreq.c

diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index d8c3595e90236e5f9d87ca9b5f55a7cbdb76ccdc..9fedf627e000d5338b3c97b1f0760c8b67dbb28d 100644 (file)
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -177,22 +177,16 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index)
        /* scaling down?  scale voltage after frequency */
        if (new_freq < old_freq) {
                ret = regulator_set_voltage_tol(arm_reg, volt, 0);
-               if (ret) {
+               if (ret)
                        dev_warn(cpu_dev,
                                 "failed to scale vddarm down: %d\n", ret);
-                       ret = 0;
-               }
                ret = regulator_set_voltage_tol(soc_reg, imx6_soc_volt[index], 0);
-               if (ret) {
+               if (ret)
                        dev_warn(cpu_dev, "failed to scale vddsoc down: %d\n", ret);
-                       ret = 0;
-               }
                if (!IS_ERR(pu_reg)) {
                        ret = regulator_set_voltage_tol(pu_reg, imx6_soc_volt[index], 0);
-                       if (ret) {
+                       if (ret)
                                dev_warn(cpu_dev, "failed to scale vddpu down: %d\n", ret);
-                               ret = 0;
-                       }
                }
        }
 
@@ -411,9 +405,10 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
        if (of_machine_is_compatible("fsl,imx6ul") ||
            of_machine_is_compatible("fsl,imx6ull")) {
                ret = imx6ul_opp_check_speed_grading(cpu_dev);
-               if (ret == -EPROBE_DEFER)
-                       return ret;
                if (ret) {
+                       if (ret == -EPROBE_DEFER)
+                               return ret;
+
                        dev_err(cpu_dev, "failed to read ocotp: %d\n",
                                ret);
                        return ret;