diff options
| author | Jonghwa Lee <jonghwa3.lee@samsung.com> | 2013-06-18 15:01:37 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:43:43 +0900 |
| commit | bde6c648b287fa253380c3368814ef3f191f97a3 (patch) | |
| tree | a556d3dd38958713b134be7b5df3ccade32a5739 /drivers | |
| parent | 773e6fcbd78d27173964ea84d24936777fad7855 (diff) | |
| download | linux-3.10-bde6c648b287fa253380c3368814ef3f191f97a3.tar.gz linux-3.10-bde6c648b287fa253380c3368814ef3f191f97a3.tar.bz2 linux-3.10-bde6c648b287fa253380c3368814ef3f191f97a3.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')
| -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 9966fc0a527..129e570495d 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, |