The calculation of the old conversion timeout value was based on the number of channels used by this driver. This doesn't take into account that other channels can be used by the touchscreen driver. Adjust the timeout value to the maximum if the touchscreen driver is enabled Signed-off-by: Matthias Kaehlcke <matthias@xxxxxxxxxxxx> --- drivers/iio/adc/ti_am335x_adc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c index 3ceac3e..898fc78 100644 --- a/drivers/iio/adc/ti_am335x_adc.c +++ b/drivers/iio/adc/ti_am335x_adc.c @@ -146,7 +146,11 @@ static int tiadc_read_raw(struct iio_dev *indio_dev, bool found = false; u32 step_en; unsigned long timeout = jiffies + usecs_to_jiffies +#ifdef CONFIG_TOUCHSCREEN_TI_AM335X_TSC + (IDLE_TIMEOUT * TOTAL_CHANNELS); +#else (IDLE_TIMEOUT * adc_dev->channels); +#endif step_en = get_adc_step_mask(adc_dev); am335x_tsc_se_set(adc_dev->mfd_tscadc, step_en); -- 1.8.4.rc3 -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
