diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 08:11:21 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 08:11:21 +0200 |
commit | b53761e36a509609e91a797fa63648ec43aecc13 (patch) | |
tree | 4bbb955440c7eeac562a2abc6046c60255943cbb /drivers/clocksource/time-armada-370-xp.c | |
parent | d2f5a7311bcaed681a41cb3419b8fe92a7b68bf5 (diff) | |
parent | c6935931c1894ff857616ff8549b61236a19148f (diff) | |
download | op-kernel-dev-b53761e36a509609e91a797fa63648ec43aecc13.zip op-kernel-dev-b53761e36a509609e91a797fa63648ec43aecc13.tar.gz |
Merge 4.8-rc5 into tty-next
We want the fixes in here for merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clocksource/time-armada-370-xp.c')
-rw-r--r-- | drivers/clocksource/time-armada-370-xp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c index 719b478..3c39e6f 100644 --- a/drivers/clocksource/time-armada-370-xp.c +++ b/drivers/clocksource/time-armada-370-xp.c @@ -338,7 +338,6 @@ static int __init armada_xp_timer_init(struct device_node *np) struct clk *clk = of_clk_get_by_name(np, "fixed"); int ret; - clk = of_clk_get(np, 0); if (IS_ERR(clk)) { pr_err("Failed to get clock"); return PTR_ERR(clk); |