diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-10-19 17:37:45 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-10-19 17:37:45 +0300 |
| commit | 7a9479eb30f1ff5aa2ffe1caf95d071da4709bc7 (patch) | |
| tree | 96b68aaedb9858e4cd4bae1f61bb3f9477657059 /drivers/clocksource/clps711x-timer.c | |
| parent | 608f2e77e49f99663221a857f518c568a320a4cc (diff) | |
| parent | 6c7871823908a4330e145d635371582f76ce1407 (diff) | |
| download | linux-rolling-stable.tar.xz | |
Merge v6.17.4linux-rolling-stable
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clocksource/clps711x-timer.c')
| -rw-r--r-- | drivers/clocksource/clps711x-timer.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/drivers/clocksource/clps711x-timer.c b/drivers/clocksource/clps711x-timer.c index e95fdc49c226..bbceb0289d45 100644 --- a/drivers/clocksource/clps711x-timer.c +++ b/drivers/clocksource/clps711x-timer.c @@ -78,24 +78,33 @@ static int __init clps711x_timer_init(struct device_node *np) unsigned int irq = irq_of_parse_and_map(np, 0); struct clk *clock = of_clk_get(np, 0); void __iomem *base = of_iomap(np, 0); + int ret = 0; if (!base) return -ENOMEM; - if (!irq) - return -EINVAL; - if (IS_ERR(clock)) - return PTR_ERR(clock); + if (!irq) { + ret = -EINVAL; + goto unmap_io; + } + if (IS_ERR(clock)) { + ret = PTR_ERR(clock); + goto unmap_io; + } switch (of_alias_get_id(np, "timer")) { case CLPS711X_CLKSRC_CLOCKSOURCE: clps711x_clksrc_init(clock, base); break; case CLPS711X_CLKSRC_CLOCKEVENT: - return _clps711x_clkevt_init(clock, base, irq); + ret = _clps711x_clkevt_init(clock, base, irq); + break; default: - return -EINVAL; + ret = -EINVAL; + break; } - return 0; +unmap_io: + iounmap(base); + return ret; } TIMER_OF_DECLARE(clps711x, "cirrus,ep7209-timer", clps711x_timer_init); |