priv.cpu_clk = of_clk_get_by_name(np, "cpu_clk");
        if (IS_ERR(priv.cpu_clk)) {
                dev_err(priv.dev, "Unable to get cpuclk\n");
-               return PTR_ERR(priv.cpu_clk);
+               err = PTR_ERR(priv.cpu_clk);
+               goto out_node;
        }
 
        err = clk_prepare_enable(priv.cpu_clk);
        if (err) {
                dev_err(priv.dev, "Unable to prepare cpuclk\n");
-               return err;
+               goto out_node;
        }
 
        kirkwood_freq_table[0].frequency = clk_get_rate(priv.cpu_clk) / 1000;
                goto out_ddr;
        }
 
-       of_node_put(np);
-       np = NULL;
-
        err = cpufreq_register_driver(&kirkwood_cpufreq_driver);
-       if (!err)
-               return 0;
+       if (err) {
+               dev_err(priv.dev, "Failed to register cpufreq driver\n");
+               goto out_powersave;
+       }
 
-       dev_err(priv.dev, "Failed to register cpufreq driver\n");
+       of_node_put(np);
+       return 0;
 
+out_powersave:
        clk_disable_unprepare(priv.powersave_clk);
 out_ddr:
        clk_disable_unprepare(priv.ddr_clk);
 out_cpu:
        clk_disable_unprepare(priv.cpu_clk);
+out_node:
        of_node_put(np);
 
        return err;