diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-29 09:55:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-29 09:55:22 +0100 |
| commit | 39a1142dbba04d2e08259bd10a369465c932126b (patch) | |
| tree | a2f3b0046a5fe67c07a8f2301413f23c9f57b9b2 /drivers/clk/clk-gpio.c | |
| parent | 65d8fc777f6dcfee12785c057a6b57f679641c90 (diff) | |
| parent | fc77dbd34c5c99bce46d40a2491937c3bcbd10af (diff) | |
Merge tag 'v4.5-rc6' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.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) |