forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf 
 kernel/sound/soc/codecs/wm8994.c
....@@ -3853,7 +3853,12 @@
38533853 	} else {
38543854 		dev_dbg(component->dev, "Jack not detected\n");
38553855 
3856
+		/* Release wm8994->accdet_lock to avoid deadlock:
3857
+		 * cancel_delayed_work_sync() takes wm8994->mic_work internal
3858
+		 * lock and wm1811_mic_work takes wm8994->accdet_lock */
3859
+		mutex_unlock(&wm8994->accdet_lock);
38563860 		cancel_delayed_work_sync(&wm8994->mic_work);
3861
+		mutex_lock(&wm8994->accdet_lock);
38573862 
38583863 		snd_soc_component_update_bits(component, WM8958_MICBIAS2,
38593864 				    WM8958_MICB2_DISCH, WM8958_MICB2_DISCH);