clk: gpio: Really allow an optional clock= DT property

4462b4bb · Stephen Boyd <[email protected]> · 2016-02-18 19:07:44 -08:00

We mis-merged the original patch from Russell here and so the
patch went almost all the way, except that we still failed to
probe when there wasn't a clocks property in the DT node. Allow
that case by making a negative value from
of_clk_get_parent_count() into "no parents", like the original
patch did.

Fixes: 7ed88aa2efa5 ("clk: fix clk-gpio.c with optional clock= DT property")
Cc: Russell King <[email protected]>
Cc: Michael Turquette <[email protected]>
Signed-off-by: Stephen Boyd <[email protected]>

Commit: 4462b4bbfc33a44f19710ead784ff361bda2c3b3
Parents: c430daf9

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/clk/clk-gpio.c	modified	+1	−1	View file

drivers/clk/clk-gpio.c

View file

diff --git a/drivers/clk/clk-gpio.c b/drivers/clk/clk-gpio.c
index 19fed65..7b09a26 100644
--- a/drivers/clk/clk-gpio.c
+++ b/drivers/clk/clk-gpio.c
@@ -289,7 +289,7 @@ static void __init of_gpio_clk_setup(struct device_node *node,
 
 	num_parents = of_clk_get_parent_count(node);
 	if (num_parents < 0)
-		return;
+		num_parents = 0;
 
 	data = kzalloc(sizeof(*data), GFP_KERNEL);
 	if (!data)