[PATCH 4.4-cip] Revert "ASoC: rt5645: Fix errorenous cleanup order"

[PATCH 4.4-cip] Revert "ASoC: rt5645: Fix errorenous cleanup order"

[Jan Kiszka]

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

Re: [PATCH 4.4-cip] Revert "ASoC: rt5645: Fix errorenous cleanup order"

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 555 bytes --]

Hi!

> 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>

Thank you. Let me apply this to -st-rc, it should get merged to -st
after testing and should appear in next 4.4-cip.

Best regards,
								Pavel
-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]