diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-07-17 12:16:24 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-07-17 12:16:24 +0800 |
| commit | fe4c808f845e2ff3a3fb6c66009ab69c8d01bf57 (patch) | |
| tree | 82ce8b6476c1c4c84ab05a49c94317f1ce8ac1b7 /drivers/input/misc/pmic8xxx-pwrkey.c | |
| parent | bbe8f0ee88a1eb4bb1e72e593b008faf387f30ac (diff) | |
| parent | 0ac0a856d986c1ab240753479f5e50fdfab82b14 (diff) | |
Merge tag 'v3.18.37' into linux-linaro-lsk-v3.18lsk-v3.18-16.07
This is the 3.18.37 stable release
Diffstat (limited to 'drivers/input/misc/pmic8xxx-pwrkey.c')
| -rw-r--r-- | drivers/input/misc/pmic8xxx-pwrkey.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/input/misc/pmic8xxx-pwrkey.c b/drivers/input/misc/pmic8xxx-pwrkey.c index c91e3d33aea9..88db9204bac2 100644 --- a/drivers/input/misc/pmic8xxx-pwrkey.c +++ b/drivers/input/misc/pmic8xxx-pwrkey.c @@ -94,7 +94,8 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev) if (of_property_read_u32(pdev->dev.of_node, "debounce", &kpd_delay)) kpd_delay = 15625; - if (kpd_delay > 62500 || kpd_delay == 0) { + /* Valid range of pwr key trigger delay is 1/64 sec to 2 seconds. */ + if (kpd_delay > USEC_PER_SEC * 2 || kpd_delay < USEC_PER_SEC / 64) { dev_err(&pdev->dev, "invalid power key trigger delay\n"); return -EINVAL; } @@ -124,8 +125,8 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev) pwr->name = "pmic8xxx_pwrkey"; pwr->phys = "pmic8xxx_pwrkey/input0"; - delay = (kpd_delay << 10) / USEC_PER_SEC; - delay = 1 + ilog2(delay); + delay = (kpd_delay << 6) / USEC_PER_SEC; + delay = ilog2(delay); err = regmap_read(regmap, PON_CNTL_1, &pon_cntl); if (err < 0) { |