diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-06-27 12:29:32 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-06-27 12:29:32 +0200 |
| commit | f5b816786f7687a2ec0f485a1138b009d2020352 (patch) | |
| tree | eb5ce868accdb73fe1e768c1ccadb90e9895ab18 /drivers/clocksource/timer-of.c | |
| parent | 9902747ec57d11b27c98e53d66112ecceed43c82 (diff) | |
| parent | 8c3ecd60e2ee6268e1735952e5b544f05b4dbb5a (diff) | |
Merge branch 'clockevents/4.13' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevents updates from Daniel Lezcano:
- Made the tcb_clksrc endianess agnostic as the AVR32 support is gone
(Alexandre Belloni)
- Unmap io region on failure at init time in the fsl_ftm_timer (Arvind Yadav)
- Fix a bad return value for the mips-gic-timer at init time (Christophe
Jaillet)
- Fix invalid iomap check and switch the sun4i timer to use the common timer
init routine (Daniel Lezcano)
Diffstat (limited to 'drivers/clocksource/timer-of.c')
| -rw-r--r-- | drivers/clocksource/timer-of.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-of.c b/drivers/clocksource/timer-of.c index 64b1c2081a67..f6e7491c873c 100644 --- a/drivers/clocksource/timer-of.c +++ b/drivers/clocksource/timer-of.c @@ -120,7 +120,7 @@ static __init int timer_base_init(struct device_node *np, const char *name = of_base->name ? of_base->name : np->full_name; of_base->base = of_io_request_and_map(np, of_base->index, name); - if (of_base->base) { + if (!of_base->base) { pr_err("Failed to iomap (%s)\n", name); return -ENXIO; } |