diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-09-17 11:47:56 -0700 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-09-17 11:47:56 -0700 |
| commit | a52ae5a755d980e9ff812c6f45a415ba27bfd33b (patch) | |
| tree | a0a95f52e029aca5fb855fff2cb44661a80297ac /drivers/clk/at91 | |
| parent | 0469a43bc32001e63092df87c2d1fdf588ea7b3a (diff) | |
| parent | 8ce8ebeb572d70e672a8d158e93ffaac80ea7576 (diff) | |
| download | linux-stable-a52ae5a755d980e9ff812c6f45a415ba27bfd33b.tar.gz linux-stable-a52ae5a755d980e9ff812c6f45a415ba27bfd33b.tar.bz2 linux-stable-a52ae5a755d980e9ff812c6f45a415ba27bfd33b.zip | |
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'drivers/clk/at91')
| -rw-r--r-- | drivers/clk/at91/clk-slow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/at91/clk-slow.c b/drivers/clk/at91/clk-slow.c index 0300c46ee247..32f7c1b36204 100644 --- a/drivers/clk/at91/clk-slow.c +++ b/drivers/clk/at91/clk-slow.c @@ -447,7 +447,7 @@ void __init of_at91sam9260_clk_slow_setup(struct device_node *np, int i; num_parents = of_count_phandle_with_args(np, "clocks", "#clock-cells"); - if (num_parents <= 0 || num_parents > 1) + if (num_parents != 2) return; for (i = 0; i < num_parents; ++i) { |