diff options
| author |   Mark Brown <broonie@kernel.org> | 2020-04-22 08:51:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-04-22 08:51:44 +0100 |
| commit | 41d91ec3de8a90167159275bde7ed65768723556 (patch) | |
| tree | 6b3609b4317591e3f61edd11e230ad5e3289de09 /include/linux/timer.h | |
| parent | ASoC: wm8960: Fix wrong clock after suspend & resume (diff) | |
| parent | ASoC: tegra: Enable audio mclk during tegra_asoc_utils_init() (diff) | |
Merge tag 'tegra-for-5.7-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into asoc-5.7
ASoC: tegra: Fixes for v5.7-rc3
This contains a couple of fixes that are needed to properly reconfigure
the audio clocks on older Tegra devices.
Diffstat (limited to 'include/linux/timer.h')
| -rw-r--r-- | include/linux/timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index 1e6650ed066d..0dc19a8c39c9 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -164,7 +164,7 @@ static inline void destroy_timer_on_stack(struct timer_list *timer) { } */ static inline int timer_pending(const struct timer_list * timer) { - return timer->entry.pprev != NULL; + return !hlist_unhashed_lockless(&timer->entry); } extern void add_timer_on(struct timer_list *timer, int cpu); |