From: Jan Kiszka <jan.kiszka@siemens.com>
To: cip-dev <cip-dev@lists.cip-project.org>, Pavel Machek <pavel@denx.de>
Subject: [PATCH 4.4-cip] Revert "ASoC: rt5645: Fix errorenous cleanup order"
Date: Tue, 2 Aug 2022 22:41:21 +0200 [thread overview]
Message-ID: <ed1abfd6-0bd2-c266-53bb-bfb17f51eaf4@siemens.com> (raw)
From: Jan Kiszka <jan.kiszka@siemens.com>
This reverts commit 32ab6f27ac8264da14ff3b8dc17da1013fb5560f.
Misplaced in 4.4 because there is no btn_check_timer in this kernel.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
sound/soc/codecs/rt5645.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index 15bc81ffcf45..b74840b5becf 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -3676,12 +3676,6 @@ static int rt5645_i2c_remove(struct i2c_client *i2c)
if (i2c->irq)
free_irq(i2c->irq, rt5645);
- /*
- * Since the rt5645_btn_check_callback() can queue jack_detect_work,
- * the timer need to be delted first
- */
- del_timer_sync(&rt5645->btn_check_timer);
-
cancel_delayed_work_sync(&rt5645->jack_detect_work);
cancel_delayed_work_sync(&rt5645->rcclock_work);
--
2.35.3
next reply other threads:[~2022-08-02 20:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-02 20:41 Jan Kiszka [this message]
2022-08-03 14:28 ` [PATCH 4.4-cip] Revert "ASoC: rt5645: Fix errorenous cleanup order" Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ed1abfd6-0bd2-c266-53bb-bfb17f51eaf4@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=cip-dev@lists.cip-project.org \
--cc=pavel@denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox