Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[firefly-linux-kernel-4.4.55.git] / drivers / clk / mmp / clk-mix.c

diff --git a/drivers/clk/mmp/clk-mix.c b/drivers/clk/mmp/clk-mix.c
index b79742c47d53658cbc9f3fff518aa575d7046aa2..48fa53c7ce5e0dbf4cfb7f5eb30abe0104015ef8 100644 (file)
--- a/drivers/clk/mmp/clk-mix.c
+++ b/drivers/clk/mmp/clk-mix.c
@@ -203,7 +203,7 @@ error:
 
 static long mmp_clk_mix_determine_rate(struct clk_hw *hw, unsigned long rate,
                                        unsigned long *best_parent_rate,
-                                       struct clk **best_parent_clk)
+                                       struct clk_hw **best_parent_clk)
 {
        struct mmp_clk_mix *mix = to_clk_mix(hw);
        struct mmp_clk_mix_clk_table *item;
@@ -264,7 +264,7 @@ static long mmp_clk_mix_determine_rate(struct clk_hw *hw, unsigned long rate,
 
 found:
        *best_parent_rate = parent_rate_best;
-       *best_parent_clk = parent_best;
+       *best_parent_clk = __clk_get_hw(parent_best);
 
        return mix_rate_best;
 }