clocksource/drivers/timer-of: check return value of of_iomap in timer_of_base_init()
PATCH 1/1 clocksource/drivers/timer-of: check return value of of_iomap in timer_of_base_init()
of_base->base can either be iomapped using of_io_request_and_map() or of_iomap() depending whether or not an of_base->name has been set.
Thus check of_base->base against NULL as of_iomap() does not return a PTR_ERR() in case of error.
--- drivers/clocksource/timer-of.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/clocksource/timer-of.c +3 -3
@@ -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 ;
Signature · 1 line
2.34.1
[tip: timers/core] clocksource/drivers/timer-of: Check return value of of_iomap in timer_of_base_init()
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 4467b8bad2401794fb89a0268c8c8257180bf60f Gitweb: https://git.kernel.org/tip/4467b8bad2401794fb89a0268c8c8257180bf60f Author: Guillaume Ranquet <[email protected]> AuthorDate: Mon, 07 Mar 2022 18:26:56 +01:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Mon, 07 Mar 2022 19:21:25 +01:00
clocksource/drivers/timer-of: Check return value of of_iomap in timer_of_base_init()
of_base->base can either be iomapped using of_io_request_and_map() or of_iomap() depending whether or not an of_base->name has been set.
Thus check of_base->base against NULL as of_iomap() does not return a PTR_ERR() in case of error.
--- drivers/clocksource/timer-of.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/clocksource/timer-of.c +3 -3
@@ -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 ;