Commit 0ffe8cbd authored by Charles Keepax's avatar Charles Keepax Committed by Chanwoo Choi
Browse files

extcon: arizona: Ensure variables are set for headphone detection 



The detecting flag really refers to the microphone detection stage and
as such should be cleared before arizona_identify_headphones is called.
Also the mic flag should be set before identify headphones is called as
well.

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

drivers/extcon/extcon-arizona.c

+7 −4
Original line number Diff line number Diff line
@@ -765,10 +765,11 @@ static void arizona_micd_timeout_work(struct work_struct *work) 
	mutex_lock(&info->lock);



	dev_dbg(info->arizona->dev, "MICD timed out, reporting HP\n");

	arizona_identify_headphone(info);



	info->detecting = false;



	arizona_identify_headphone(info);



	arizona_stop_mic(info);



	mutex_unlock(&info->lock);
@@ -834,6 +835,9 @@ static void arizona_micd_detect(struct work_struct *work) 


	/* If we got a high impedence we should have a headset, report it. */

	if (info->detecting && (val & ARIZONA_MICD_LVL_8)) {

		info->mic = true;

		info->detecting = false;



		arizona_identify_headphone(info);



		ret = extcon_set_cable_state_(info->edev,
@@ -849,8 +853,6 @@ static void arizona_micd_detect(struct work_struct *work) 
				ret);

		}



		info->mic = true;

		info->detecting = false;

		goto handled;

	}
@@ -863,10 +865,11 @@ static void arizona_micd_detect(struct work_struct *work) 
	if (info->detecting && (val & MICD_LVL_1_TO_7)) {

		if (info->jack_flips >= info->micd_num_modes * 10) {

			dev_dbg(arizona->dev, "Detected HP/line\n");

			arizona_identify_headphone(info);



			info->detecting = false;



			arizona_identify_headphone(info);



			arizona_stop_mic(info);

		} else {

			info->micd_mode++;

CRA Git | Maintained and supported by SUSTech CRA and CCSE