extcon: arizona: Ensure variables are set for headphone detection
PATCH 1/1 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 Charles Keepax <[email protected]>
---
Note this was generated on top of the other patch chain I sent today.
Thanks,
Charles
drivers/extcon/extcon-arizona.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)
drivers/extcon/extcon-arizona.c +7 -4
@@ -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++;
Signature · 1 line
1.7.2.5
Quoted 7 lines · Charles Keepax
The detecting flag really refers to the microphone detection stage and as such should be cleared before
arizona_identify_headphonesis called. Also the mic flag should be set before identify headphones is called as well.Signed-off-by Charles Keepax <[email protected]>---
I will wrap this into the resend of my other series.
Thanks,
Charles