Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[linux-2.6-block.git] / drivers / clk / at91 / clk-main.c

diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
index 4bfc94d6c26ea3643aa87caeb359f7fc363aedf6..58b5baca670c3416fe0fc1733088f7526349005c 100644 (file)
--- a/drivers/clk/at91/clk-main.c
+++ b/drivers/clk/at91/clk-main.c
@@ -291,7 +291,7 @@ at91_clk_register_main_rc_osc(struct regmap *regmap,
        init.ops = &main_rc_osc_ops;
        init.parent_names = NULL;
        init.num_parents = 0;
-       init.flags = CLK_IS_ROOT | CLK_IGNORE_UNUSED;
+       init.flags = CLK_IGNORE_UNUSED;
 
        osc->hw.init = &init;
        osc->regmap = regmap;
@@ -572,12 +572,12 @@ static void __init of_at91sam9x5_clk_main_setup(struct device_node *np)
 {
        struct clk *clk;
        const char *parent_names[2];
-       int num_parents;
+       unsigned int num_parents;
        const char *name = np->name;
        struct regmap *regmap;
 
        num_parents = of_clk_get_parent_count(np);
-       if (num_parents <= 0 || num_parents > 2)
+       if (num_parents == 0 || num_parents > 2)
                return;
 
        of_clk_parent_fill(np, parent_names, num_parents);