These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / input / keyboard / clps711x-keypad.c

diff --git a/kernel/drivers/input/keyboard/clps711x-keypad.c b/kernel/drivers/input/keyboard/clps711x-keypad.c
index 27ef29f..b637f1a 100644 (file)
--- a/kernel/drivers/input/keyboard/clps711x-keypad.c
+++ b/kernel/drivers/input/keyboard/clps711x-keypad.c
@@ -120,14 +120,9 @@ static int clps711x_keypad_probe(struct platform_device *pdev)
        for (i = 0; i < priv->row_count; i++) {
                struct clps711x_gpio_data *data = &priv->gpio_data[i];
 
-               data->desc = devm_gpiod_get_index(dev, "row", i);
-               if (!data->desc)
-                       return -EINVAL;
-
+               data->desc = devm_gpiod_get_index(dev, "row", i, GPIOD_IN);
                if (IS_ERR(data->desc))
                        return PTR_ERR(data->desc);
-
-               gpiod_direction_input(data->desc);
        }
 
        err = of_property_read_u32(np, "poll-interval", &poll_interval);