Messages in this thread Patch in this message | | | From | Charles Keepax <> | Subject | [PATCH 2/2] extcon: arizona: Fix reset of HPDET after race with removal | Date | Sat, 26 Oct 2013 15:10:18 +0100 |
| |
We need to make sure we reset back to our starting state, especially making sure that we have disabled poll in the register cache.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> --- drivers/extcon/extcon-arizona.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c index 92eb486..3ce7b49 100644 --- a/drivers/extcon/extcon-arizona.c +++ b/drivers/extcon/extcon-arizona.c @@ -572,6 +572,14 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data) goto out; } else if (!ret) { dev_dbg(arizona->dev, "Ignoring HPDET for removed cable\n"); + + /* Reset back to starting range */ + regmap_update_bits(arizona->regmap, + ARIZONA_HEADPHONE_DETECT_1, + ARIZONA_HP_IMPEDANCE_RANGE_MASK | + ARIZONA_HP_POLL, + 0); + goto done; } @@ -607,9 +615,9 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data) dev_err(arizona->dev, "Failed to report HP/line: %d\n", ret); +done: arizona_extcon_do_magic(info, 0); -done: if (id_gpio) gpio_set_value_cansleep(id_gpio, 0); -- 1.7.2.5
| |