Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31a847e6 authored by Charles Keepax's avatar Charles Keepax Committed by Chanwoo Choi
Browse files

extcon: arizona: Fix race with microphone detection and removal 



The microphone detection code is run as delayed work to provide
additional debounce, it is possible that the jack could have been
removed by the time we process the microphone detection. Turn this
case into a no op.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent a3e00d4b

drivers/extcon/extcon-arizona.c

+13 −0
Original line number Diff line number Diff line
@@ -780,6 +780,19 @@ static void arizona_micd_detect(struct work_struct *work) 


	mutex_lock(&info->lock);



	/* If the cable was removed while measuring ignore the result */

	ret = extcon_get_cable_state_(&info->edev, ARIZONA_CABLE_MECHANICAL);

	if (ret < 0) {

		dev_err(arizona->dev, "Failed to check cable state: %d\n",

				ret);

		mutex_unlock(&info->lock);

		return;

	} else if (!ret) {

		dev_dbg(arizona->dev, "Ignoring MICDET for removed cable\n");

		mutex_unlock(&info->lock);

		return;

	}



	for (i = 0; i < 10 && !(val & MICD_LVL_0_TO_8); i++) {

		ret = regmap_read(arizona->regmap, ARIZONA_MIC_DETECT_3, &val);

		if (ret != 0) {