diff options
| author | Lee Jones <lee.jones@linaro.org> | 2013-01-28 10:20:45 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2013-02-04 09:33:27 +0100 |
| commit | f825ebe522e974fec84525f12a43ec70e304e248 (patch) | |
| tree | 34044695116a51e3ba5565659e0c70d8ee839633 /drivers/mfd/ab8500-gpadc.c | |
| parent | mfd: ab8500-debugfs: sizeof() mismatch bugfix (diff) | |
| download | linux-f825ebe522e974fec84525f12a43ec70e304e248.tar.xz linux-f825ebe522e974fec84525f12a43ec70e304e248.zip | |
mfd: ab8500-gpadc: Reduce conversion timeout
Reduce the conversion timeout from 2s to 0.5s
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com>
Diffstat (limited to 'drivers/mfd/ab8500-gpadc.c')
| -rw-r--r-- | drivers/mfd/ab8500-gpadc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c index 580f1008d67a..44fa224a443e 100644 --- a/drivers/mfd/ab8500-gpadc.c +++ b/drivers/mfd/ab8500-gpadc.c @@ -86,6 +86,8 @@ /* Time in ms before disabling regulator */ #define GPADC_AUDOSUSPEND_DELAY 1 +#define CONVERSION_TIME 500 /* ms */ + enum cal_channels { ADC_INPUT_VMAIN = 0, ADC_INPUT_BTEMP, @@ -372,7 +374,8 @@ int ab8500_gpadc_read_raw(struct ab8500_gpadc *gpadc, u8 channel) goto out; } /* wait for completion of conversion */ - if (!wait_for_completion_timeout(&gpadc->ab8500_gpadc_complete, 2*HZ)) { + if (!wait_for_completion_timeout(&gpadc->ab8500_gpadc_complete, + msecs_to_jiffies(CONVERSION_TIME))) { dev_err(gpadc->dev, "timeout: didn't receive GPADC conversion interrupt\n"); ret = -EINVAL; |