Merge branch 'work.mount3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux.git] / drivers / clk / clk-lochnagar.c

diff --git a/drivers/clk/clk-lochnagar.c b/drivers/clk/clk-lochnagar.c
index fa8c91758b1d7dc88e2f8c2cdd3566b939b0cebe..565bcd0cdde9e907003fc2281bb52f689cbd12b3 100644 (file)
--- a/drivers/clk/clk-lochnagar.c
+++ b/drivers/clk/clk-lochnagar.c
@@ -198,7 +198,7 @@ static u8 lochnagar_clk_get_parent(struct clk_hw *hw)
        if (ret < 0) {
                dev_dbg(priv->dev, "Failed to read parent of %s: %d\n",
                        lclk->name, ret);
-               return hw->init->num_parents;
+               return clk_hw_get_num_parents(hw);
        }
 
        val &= lclk->src_mask;