Commit 381437dd authored by Bard Liao's avatar Bard Liao Committed by Mark Brown

ASoC: rt5645: polling jd status in all conditions

We only polling jd status when rt5645->pdata.jd_invert is true.
However, it should be done at all time since there will be no
interrupt for jd if we press a headset button and remove the
headset at the same time.
Signed-off-by: default avatarBard Liao <bardliao@realtek.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 178ff7c6
...@@ -3286,10 +3286,8 @@ static void rt5645_jack_detect_work(struct work_struct *work) ...@@ -3286,10 +3286,8 @@ static void rt5645_jack_detect_work(struct work_struct *work)
if (btn_type == 0)/* button release */ if (btn_type == 0)/* button release */
report = rt5645->jack_type; report = rt5645->jack_type;
else { else {
if (rt5645->pdata.jd_invert) { mod_timer(&rt5645->btn_check_timer,
mod_timer(&rt5645->btn_check_timer, msecs_to_jiffies(100));
msecs_to_jiffies(100));
}
} }
break; break;
...@@ -3816,9 +3814,9 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, ...@@ -3816,9 +3814,9 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
if (rt5645->pdata.jd_invert) { if (rt5645->pdata.jd_invert) {
regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2, regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2,
RT5645_JD_1_1_MASK, RT5645_JD_1_1_INV); RT5645_JD_1_1_MASK, RT5645_JD_1_1_INV);
setup_timer(&rt5645->btn_check_timer,
rt5645_btn_check_callback, (unsigned long)rt5645);
} }
setup_timer(&rt5645->btn_check_timer,
rt5645_btn_check_callback, (unsigned long)rt5645);
INIT_DELAYED_WORK(&rt5645->jack_detect_work, rt5645_jack_detect_work); INIT_DELAYED_WORK(&rt5645->jack_detect_work, rt5645_jack_detect_work);
INIT_DELAYED_WORK(&rt5645->rcclock_work, rt5645_rcclock_work); INIT_DELAYED_WORK(&rt5645->rcclock_work, rt5645_rcclock_work);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment