diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2016-02-18 19:07:44 -0800 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-02-18 19:10:22 -0800 |
| commit | 4462b4bbfc33a44f19710ead784ff361bda2c3b3 (patch) | |
| tree | e892282d87d09a7ffd25813dd221ec70c545e7f7 /drivers/clk/clk-gpio.c | |
| parent | c430daf951c56e1eaf47c1825dcd5574f95ed29a (diff) | |
| download | linux-4462b4bbfc33a44f19710ead784ff361bda2c3b3.tar.bz2 | |
clk: gpio: Really allow an optional clock= DT property
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 <rmk+kernel@arm.linux.org.uk>
Cc: Michael Turquette <mturquette@baylibre.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk/clk-gpio.c')
| -rw-r--r-- | drivers/clk/clk-gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk-gpio.c b/drivers/clk/clk-gpio.c index 19fed65587e8..7b09a265d79f 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) |