Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-drm-fsl-dcu.git] / drivers / input / keyboard / gpio_keys_polled.c

diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index 959b826d25c8b4de69c9bad5bff00039268609fd..c6dc644aa5806b37cb4e0dcbbc6217d915e8a562 100644 (file)
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -125,7 +125,7 @@ static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct
        device_for_each_child_node(dev, child) {
                struct gpio_desc *desc;
 
-               desc = devm_get_gpiod_from_child(dev, child);
+               desc = devm_get_gpiod_from_child(dev, NULL, child);
                if (IS_ERR(desc)) {
                        error = PTR_ERR(desc);
                        if (error != -EPROBE_DEFER)