diff options
Diffstat (limited to 'drivers/clocksource/timer-of.c')
| -rw-r--r-- | drivers/clocksource/timer-of.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clocksource/timer-of.c b/drivers/clocksource/timer-of.c index a3c73e972fce..bf2a6f64ba0c 100644 --- a/drivers/clocksource/timer-of.c +++ b/drivers/clocksource/timer-of.c @@ -157,9 +157,9 @@ static __init int timer_of_base_init(struct device_node *np, of_base->base = of_base->name ? of_io_request_and_map(np, of_base->index, of_base->name) : of_iomap(np, of_base->index); - if (IS_ERR(of_base->base)) { - pr_err("Failed to iomap (%s)\n", of_base->name); - return PTR_ERR(of_base->base); + if (IS_ERR_OR_NULL(of_base->base)) { + pr_err("Failed to iomap (%s:%s)\n", np->name, of_base->name); + return of_base->base ? PTR_ERR(of_base->base) : -ENOMEM; } return 0; |