diff options
| author | Jonghwa Lee <jonghwa3.lee@samsung.com> | 2013-06-18 15:01:37 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-03-20 17:34:33 +0900 |
| commit | 9b59fb766b7bd4fb31046ce9597e70f1213efc44 (patch) | |
| tree | eb55a1660d592d1da2d9fc67d697ef70de50fcc5 /drivers/extcon | |
| parent | 9a10cee36475b3d25083f1b7ceaa8a9585487712 (diff) | |
| download | linux-3.10-9b59fb766b7bd4fb31046ce9597e70f1213efc44.tar.gz linux-3.10-9b59fb766b7bd4fb31046ce9597e70f1213efc44.tar.bz2 linux-3.10-9b59fb766b7bd4fb31046ce9597e70f1213efc44.zip | |
extcon: max77693: Fix bug related to MAX77693 irq when set ADC debounce time
Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Diffstat (limited to 'drivers/extcon')
| -rw-r--r-- | drivers/extcon/extcon-max77693.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c index b56bdaa27d4..2f1e3f113dd 100644 --- a/drivers/extcon/extcon-max77693.c +++ b/drivers/extcon/extcon-max77693.c @@ -285,6 +285,14 @@ static int max77693_muic_set_path(struct max77693_muic_info *info, int ret = 0; u8 ctrl1, ctrl2 = 0; + /* Set open state to path before changing hw path */ + ret = max77693_update_reg(info->max77693->regmap_muic, + MAX77693_MUIC_REG_CTRL1, CONTROL1_SW_OPEN, COMP_SW_MASK); + if (ret < 0) { + dev_err(info->dev, "failed to update MUIC register\n"); + return ret; + } + if (attached) ctrl1 = val; else @@ -1246,7 +1254,7 @@ static int max77693_muic_probe(struct platform_device *pdev) } /* Set initial path for UART */ - max77693_muic_set_path(info, info->path_uart, true); + max77693_muic_set_path(info, info->path_uart, true); /* Check revision number of MUIC device*/ ret = max77693_read_reg(info->max77693->regmap_muic, |