If GPIO probing is deferred, the driver tries to
claim an invalid GPIO line which leads to an error
message like this:
gpio-keys-polled buttons.2: unable to claim gpio 4294966779, err=-22
gpio-keys-polled: probe of buttons.2 failed with error -22
The patch ensures that 'gpio_keys_polled_get_devtree_pdata'
returns -EPROBE_DEFER if any of the GPIOs to register are
deferred.
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Gabor Juhos <juhosg@xxxxxxxxxxx>
---
drivers/input/keyboard/gpio_keys_polled.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index f686fd9..cfb54cc 100644
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -120,6 +120,12 @@ static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct
if (nbuttons == 0)
return NULL;
+ for_each_child_of_node(node, pp) {
+ error = of_get_gpio(pp, 0);
+ if (error == -EPROBE_DEFER)
+ goto err_out;
+ }
+
pdata = kzalloc(sizeof(*pdata) + nbuttons * (sizeof *button),
GFP_KERNEL);
if (!pdata) {
--
1.7.10
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
