diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-12 10:07:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-12 10:07:50 -0800 |
| commit | c7fc51268bc09c5f012f5e35e872f4e319f95f80 (patch) | |
| tree | bc0418723151ae6190140fa77105f4a95ac091e6 /drivers/clocksource/dw_apb_timer_of.c | |
| parent | 82d2ef454052372f36e3642ac09efe48c3d59220 (diff) | |
| parent | aa073d8b2a6308832de3cac18e7901ac60748e26 (diff) | |
| download | linux-c7fc51268bc09c5f012f5e35e872f4e319f95f80.tar.bz2 | |
Merge tag 'timers-urgent-2021-12-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"Two fixes for clock chip drivers:
- A regression fix for the Designware APB timer. A recent change to
the error checking code transformed the error condition wrongly so
it turned into a fail if good condition.
- Fix a clang build fail of the ARM architected timer driver"
* tag 'timers-urgent-2021-12-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource/drivers/arm_arch_timer: Force inlining of erratum_set_next_event_generic()
clocksource/drivers/dw_apb_timer_of: Fix probe failure
Diffstat (limited to 'drivers/clocksource/dw_apb_timer_of.c')
| -rw-r--r-- | drivers/clocksource/dw_apb_timer_of.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c index 3819ef5b7098..3245eb0c602d 100644 --- a/drivers/clocksource/dw_apb_timer_of.c +++ b/drivers/clocksource/dw_apb_timer_of.c @@ -47,7 +47,7 @@ static int __init timer_get_base_and_rate(struct device_node *np, pr_warn("pclk for %pOFn is present, but could not be activated\n", np); - if (!of_property_read_u32(np, "clock-freq", rate) && + if (!of_property_read_u32(np, "clock-freq", rate) || !of_property_read_u32(np, "clock-frequency", rate)) return 0; |