cond_resched() is not works as expected for clps711x-keypad driver and cause runtime error. This patch replaces this call with udelay().
Signed-off-by: Alexander Shiyan <[email protected]> --- drivers/input/keyboard/clps711x-keypad.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/input/keyboard/clps711x-keypad.c b/drivers/input/keyboard/clps711x-keypad.c index 552b65c..650205d 100644 --- a/drivers/input/keyboard/clps711x-keypad.c +++ b/drivers/input/keyboard/clps711x-keypad.c @@ -9,13 +9,13 @@ * (at your option) any later version. */ +#include <linux/delay.h> #include <linux/input.h> #include <linux/input-polldev.h> #include <linux/module.h> #include <linux/of_gpio.h> #include <linux/platform_device.h> #include <linux/regmap.h> -#include <linux/sched.h> #include <linux/input/matrix_keypad.h> #include <linux/mfd/syscon.h> #include <linux/mfd/syscon/clps711x.h> @@ -54,9 +54,9 @@ static void clps711x_keypad_poll(struct input_polled_dev *dev) /* Read twice for protection against fluctuations */ do { - state = gpiod_get_value_cansleep(data->desc); - cond_resched(); - state1 = gpiod_get_value_cansleep(data->desc); + state = gpiod_get_value(data->desc); + udelay(5); + state1 = gpiod_get_value(data->desc); } while (state != state1); if (test_bit(col, data->last_state) != state) { -- 1.8.5.5 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
