diff options
| author | Dmitry Osipenko | 2019-06-03 20:59:43 +0200 |
|---|---|---|
| committer | Daniel Lezcano | 2019-06-25 19:49:18 +0200 |
| commit | 7a3916706e858ad0bc3b5629c68168e1449de26a (patch) | |
| tree | c44f451f73b054e1f90a4ffe708ff09a938954f8 /drivers/clocksource | |
| parent | clocksource/drivers/tegra: Replace readl/writel with relaxed versions (diff) | |
| download | kernel-qcow2-linux-7a3916706e858ad0bc3b5629c68168e1449de26a.tar.gz kernel-qcow2-linux-7a3916706e858ad0bc3b5629c68168e1449de26a.tar.xz kernel-qcow2-linux-7a3916706e858ad0bc3b5629c68168e1449de26a.zip | |
clocksource/drivers/tegra: Release all IRQ's on request_irq() error
Release all requested IRQ's on the request error to properly clean up
allocated resources.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Acked-By: Peter De Schrijver <pdeschrijver@nvidia.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/timer-tegra20.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clocksource/timer-tegra20.c b/drivers/clocksource/timer-tegra20.c index 276b55f6ada0..e2ef6b8211a5 100644 --- a/drivers/clocksource/timer-tegra20.c +++ b/drivers/clocksource/timer-tegra20.c @@ -284,7 +284,7 @@ static int __init tegra_init_timer(struct device_node *np, bool tegra20) pr_err("%s: can't map IRQ for CPU%d\n", __func__, cpu); ret = -EINVAL; - goto out; + goto out_irq; } irq_set_status_flags(cpu_to->clkevt.irq, IRQ_NOAUTOEN); @@ -294,7 +294,8 @@ static int __init tegra_init_timer(struct device_node *np, bool tegra20) if (ret) { pr_err("%s: cannot setup irq %d for CPU%d\n", __func__, cpu_to->clkevt.irq, cpu); - ret = -EINVAL; + irq_dispose_mapping(cpu_to->clkevt.irq); + cpu_to->clkevt.irq = 0; goto out_irq; } } |