diff options
| author | Mark Brown <broonie@kernel.org> | 2024-02-19 16:58:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-02-19 16:58:41 +0000 |
| commit | d68ce3aa8142333a96a071a9a0207f21c04e54cc (patch) | |
| tree | 15754707ec571eb08c8d6308fe2459e46b8a5468 /net/wireless/core.c | |
| parent | ec29a4d9b7c7329afc61e7932cb91e9b292b2b74 (diff) | |
| parent | b401b621758e46812da61fa58a67c3fd8d91de0d (diff) | |
regulator: Merge up v6.8-rc5
There are dependencies on the PWM fixes for some new work on the PWM
driver.
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 409d74c57ca0..3fb1b637352a 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -5,7 +5,7 @@ * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net> * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt @@ -1661,6 +1661,7 @@ void wiphy_delayed_work_queue(struct wiphy *wiphy, unsigned long delay) { if (!delay) { + del_timer(&dwork->timer); wiphy_work_queue(wiphy, &dwork->work); return; } |