diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-25 16:27:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-25 16:27:51 -0800 |
| commit | 297ea1b7f717db660fa6eb543dc0af41f7bf8d57 (patch) | |
| tree | 057e3f108390c113516782d9de85cc537f8a0872 /drivers/clocksource/timer-sun5i.c | |
| parent | c89be5242607d8aa08a6fa45a887c68b2d4a2a2c (diff) | |
| parent | ed7158bae41044ff696e9aafd5ada46d391a5a2e (diff) | |
| download | linux-297ea1b7f717db660fa6eb543dc0af41f7bf8d57.tar.bz2 | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull cleanup patchlet from Thomas Gleixner:
"A single commit removing a bunch of bogus double semicolons all over
the tree"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
treewide/trivial: Remove ';;$' typo noise
Diffstat (limited to 'drivers/clocksource/timer-sun5i.c')
| -rw-r--r-- | drivers/clocksource/timer-sun5i.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c index 2a3fe83ec337..3b56ea3f52af 100644 --- a/drivers/clocksource/timer-sun5i.c +++ b/drivers/clocksource/timer-sun5i.c @@ -334,7 +334,7 @@ static int __init sun5i_timer_init(struct device_node *node) timer_base = of_io_request_and_map(node, 0, of_node_full_name(node)); if (IS_ERR(timer_base)) { pr_err("Can't map registers\n"); - return PTR_ERR(timer_base);; + return PTR_ERR(timer_base); } irq = irq_of_parse_and_map(node, 0); |