diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2022-05-27 10:32:08 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2022-05-27 10:32:08 +0200 |
| commit | 57963a92a70b037aa22544fbc34742e5be689c04 (patch) | |
| tree | ea4591ebe6bdd6dea8286c4eef6cc7906716acb3 /drivers/clocksource/timer-ti-dm.c | |
| parent | 317f29c14d0cca09952f1022491454b23455ebcb (diff) | |
| parent | 9c04a8ff03def4df3f81219ffbe1ec9b44ff5348 (diff) | |
| download | linux-57963a92a70b037aa22544fbc34742e5be689c04.tar.gz linux-57963a92a70b037aa22544fbc34742e5be689c04.tar.bz2 linux-57963a92a70b037aa22544fbc34742e5be689c04.zip | |
Merge tag 'timers-v5.19-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent/clocksource driver updates from Daniel Lezcano:
- Add Mediatek MT8186 DT bindings (Allen-KH Cheng)
- Remove dead code corresponding of the IXP4xx board removal (Linus
Walleij)
- Add CLOCK_EVT_FEAT_C3STOP flag for the RISC-V SBI timer (Samuel
Holland)
- Do not return an error if there are multiple definitions of the sp804
timers in the DT (Andre Przywara)
- Add the missing SPDX identifier (Thomas Gleixner)
- Remove an unncessary NULL check as it is done right before at probe
time for the timer-ti-dm (Dan Carpenter)
- Fix the irq_of_parse_and_map() return code check on onexas-nps
(Krzysztof Kozlowski)
Link: https://lore.kernel.org/lkml/b5a83e54-1ee1-f910-4be4-bc3bf1015243@linaro.org
Diffstat (limited to 'drivers/clocksource/timer-ti-dm.c')
| -rw-r--r-- | drivers/clocksource/timer-ti-dm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c index 3e52c5226c4d..33609be0b304 100644 --- a/drivers/clocksource/timer-ti-dm.c +++ b/drivers/clocksource/timer-ti-dm.c @@ -828,8 +828,7 @@ static int omap_dm_timer_probe(struct platform_device *pdev) cpu_pm_register_notifier(&timer->nb); } - if (pdata) - timer->errata = pdata->timer_errata; + timer->errata = pdata->timer_errata; timer->pdev = pdev; |