diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2016-02-18 19:17:29 -0800 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-02-18 19:17:29 -0800 |
commit | 6a05d862c3f03b367e14d8727c5b243ecb92a653 (patch) | |
tree | c19dbe793e008c0bd716ce8087b6b362430bc59b /drivers/clk/clk-gpio.c | |
parent | clk: Make of_clk_get_from_provider() available to modules (diff) | |
parent | clk: gpio: Really allow an optional clock= DT property (diff) | |
download | wireguard-linux-6a05d862c3f03b367e14d8727c5b243ecb92a653.tar.xz wireguard-linux-6a05d862c3f03b367e14d8727c5b243ecb92a653.zip |
Merge branch 'clk-fixes' into clk-next
* clk-fixes:
clk: gpio: Really allow an optional clock= DT property
Revert "clk: qcom: Specify LE device endianness"
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 fb32a7366ef6..522bffdbacc5 100644 --- a/drivers/clk/clk-gpio.c +++ b/drivers/clk/clk-gpio.c @@ -212,7 +212,7 @@ static int gpio_clk_driver_probe(struct platform_device *pdev) num_parents = of_clk_get_parent_count(node); if (num_parents < 0) - return -EINVAL; + num_parents = 0; if (num_parents) { parent_names = devm_kcalloc(&pdev->dev, num_parents, |