Merge remote-tracking branches 'spi/fix/fsl-cpm', 'spi/fix/fsl-dspi' and 'spi/fix...

[linux-2.6-block.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 90df4df58b076ee3feac7f50db0d3d27760f9cbb..097d7216d98ee4e4d394726e9d4c9743067d14f8 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)