Merge tag 'pwm/for-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[cascardo/linux.git] / drivers / clk / clk-gpio.c

diff --git a/drivers/clk/clk-gpio.c b/drivers/clk/clk-gpio.c
index 335322d..19fed65 100644 (file)
--- a/drivers/clk/clk-gpio.c
+++ b/drivers/clk/clk-gpio.c
@@ -264,8 +264,8 @@ static struct clk *of_clk_gpio_gate_delayed_register_get(const char *name,
                const char * const *parent_names, u8 num_parents,
                unsigned gpio, bool active_low)
 {
-       return clk_register_gpio_gate(NULL, name, parent_names[0],
-                       gpio, active_low, 0);
+       return clk_register_gpio_gate(NULL, name, parent_names ?
+                       parent_names[0] : NULL, gpio, active_low, 0);
 }
 
 static struct clk *of_clk_gpio_mux_delayed_register_get(const char *name,
@@ -287,18 +287,26 @@ static void __init of_gpio_clk_setup(struct device_node *node,
        const char **parent_names;
        int i, num_parents;
 
-       data = kzalloc(sizeof(*data), GFP_KERNEL);
-       if (!data)
-               return;
-
        num_parents = of_clk_get_parent_count(node);
+       if (num_parents < 0)
+               return;
 
-       parent_names = kcalloc(num_parents, sizeof(char *), GFP_KERNEL);
-       if (!parent_names)
+       data = kzalloc(sizeof(*data), GFP_KERNEL);
+       if (!data)
                return;
 
-       for (i = 0; i < num_parents; i++)
-               parent_names[i] = of_clk_get_parent_name(node, i);
+       if (num_parents) {
+               parent_names = kcalloc(num_parents, sizeof(char *), GFP_KERNEL);
+               if (!parent_names) {
+                       kfree(data);
+                       return;
+               }
+
+               for (i = 0; i < num_parents; i++)
+                       parent_names[i] = of_clk_get_parent_name(node, i);
+       } else {
+               parent_names = NULL;
+       }
 
        data->num_parents = num_parents;
        data->parent_names = parent_names;