diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2022-01-10 09:56:57 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2022-01-10 09:56:57 +0100 |
| commit | 3551a3ff8229e15d2a4b47b8234923bc72da65ef (patch) | |
| tree | a62465753397b0268529a5d0b9ab43a8840069ad /drivers/clocksource/dw_apb_timer_of.c | |
| parent | 906095af85e8b2e53ee9f8c50b3dff365aa09df8 (diff) | |
| parent | 33a5c2793451770cb6dcf0cc35c76cfd4b045513 (diff) | |
| download | linux-3551a3ff8229e15d2a4b47b8234923bc72da65ef.tar.gz linux-3551a3ff8229e15d2a4b47b8234923bc72da65ef.tar.bz2 linux-3551a3ff8229e15d2a4b47b8234923bc72da65ef.zip | |
Merge branch 'for-5.17/letsketch' into for-linus
- new driver to support for LetSketch device (Hans de Goede)
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; |