From: Charles Keepax Date: Mon, 9 Dec 2019 11:09:10 +0000 (+0000) Subject: extcon: arizona: Clear jack status regardless of detection type X-Git-Tag: v5.6-rc1~136^2~8^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac7614fab9dd1054ec6bd082f02a436bb5cb082f;p=thirdparty%2Fkernel%2Flinux.git extcon: arizona: Clear jack status regardless of detection type It makes sense to clear the internal state of the jack detection regardless of if the headphone detect based accessory detection or the normal microphone detect based flow is used. No issues are currently known because of this but the change makes more logical sense and eases future refactoring of the code. Signed-off-by: Charles Keepax Signed-off-by: Chanwoo Choi --- diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c index 121c417069478..11f1d753aa102 100644 --- a/drivers/extcon/extcon-arizona.c +++ b/drivers/extcon/extcon-arizona.c @@ -1154,11 +1154,11 @@ static irqreturn_t arizona_jackdet(int irq, void *data) dev_err(arizona->dev, "Mechanical report failed: %d\n", ret); - if (!arizona->pdata.hpdet_acc_id) { - info->detecting = true; - info->mic = false; - info->jack_flips = 0; + info->detecting = true; + info->mic = false; + info->jack_flips = 0; + if (!arizona->pdata.hpdet_acc_id) { arizona_start_mic(info); } else { queue_delayed_work(system_power_efficient_wq,