diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2016-12-19 01:13:09 +0100 |
|---|---|---|
| committer | Chanwoo Choi <cw00.choi@samsung.com> | 2017-01-09 10:04:10 +0900 |
| commit | 5d2199ea340d158587b09e2ab95908c210fd4742 (patch) | |
| tree | 0df9f2a7c9793dc4c37eacae6424688c5101a187 /drivers/extcon | |
| parent | 3fe1e0e2ab509863c1e9809a085508d8bce3e079 (diff) | |
| download | linux-5d2199ea340d158587b09e2ab95908c210fd4742.tar.bz2 | |
extcon: axp288: Fix possibly reporting 2 cables in state true
When the charger type changes from e.g. SDP to CDP, without Vbus being
seen as low in between axp288_handle_chrg_det_event would set the state
for the new cable type to true, without clearing the state of the
previous cable type to false.
This commit fixes this and also gets rid of the function local static
cable variable, properly storing all drv state in the axp288_extcon_info
struct.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Diffstat (limited to 'drivers/extcon')
| -rw-r--r-- | drivers/extcon/extcon-axp288.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c index 43b3637a71a9..98289a266810 100644 --- a/drivers/extcon/extcon-axp288.c +++ b/drivers/extcon/extcon-axp288.c @@ -115,6 +115,7 @@ struct axp288_extcon_info { int irq[EXTCON_IRQ_END]; struct extcon_dev *edev; struct notifier_block extcon_nb; + unsigned int previous_cable; }; /* Power up/down reason string array */ @@ -154,9 +155,9 @@ static void axp288_extcon_log_rsi(struct axp288_extcon_info *info) static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info) { - static unsigned int cable; int ret, stat, cfg, pwr_stat; u8 chrg_type; + unsigned int cable = info->previous_cable; bool vbus_attach = false; ret = regmap_read(info->regmap, AXP288_PS_STAT_REG, &pwr_stat); @@ -212,7 +213,11 @@ no_vbus: vbus_attach ? EXTCON_GPIO_MUX_SEL_SOC : EXTCON_GPIO_MUX_SEL_PMIC); - extcon_set_state_sync(info->edev, cable, vbus_attach); + extcon_set_state_sync(info->edev, info->previous_cable, false); + if (vbus_attach) { + extcon_set_state_sync(info->edev, cable, vbus_attach); + info->previous_cable = cable; + } return 0; @@ -263,6 +268,7 @@ static int axp288_extcon_probe(struct platform_device *pdev) info->dev = &pdev->dev; info->regmap = axp20x->regmap; info->regmap_irqc = axp20x->regmap_irqc; + info->previous_cable = EXTCON_NONE; if (pdata) info->gpio_mux_cntl = pdata->gpio_mux_cntl; |