Merge branch 'pm-cpufreq'

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

diff --git a/drivers/cpufreq/s3c2416-cpufreq.c b/drivers/cpufreq/s3c2416-cpufreq.c
index f7ff1ed7fef18be25c5da1a7785904ad19cd67d0..106910351c41683a23752ccde7b3da2069005ed3 100644 (file)
--- a/drivers/cpufreq/s3c2416-cpufreq.c
+++ b/drivers/cpufreq/s3c2416-cpufreq.c
@@ -447,21 +447,16 @@ static int s3c2416_cpufreq_driver_init(struct cpufreq_policy *policy)
        /* Datasheet says PLL stabalisation time must be at least 300us,
         * so but add some fudge. (reference in LOCKCON0 register description)
         */
-       ret = cpufreq_generic_init(policy, s3c_freq->freq_table,
+       cpufreq_generic_init(policy, s3c_freq->freq_table,
                        (500 * 1000) + s3c_freq->regulator_latency);
-       if (ret)
-               goto err_freq_table;
-
        register_reboot_notifier(&s3c2416_cpufreq_reboot_notifier);
 
        return 0;
 
-err_freq_table:
 #ifdef CONFIG_ARM_S3C2416_CPUFREQ_VCORESCALE
-       regulator_put(s3c_freq->vddarm);
 err_vddarm:
-#endif
        clk_put(s3c_freq->armclk);
+#endif
 err_armclk:
        clk_put(s3c_freq->hclk);
 err_hclk: