projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
gpio: Pass GPIO label down to gpiod_request
[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 fd7ab4dad87bc5c34f30d36e5da7f50c50d68494..5e35c565e3418487ecc784340fe018c5fb6d1e23 100644
(file)
--- a/
drivers/input/keyboard/gpio_keys_polled.c
+++ b/
drivers/input/keyboard/gpio_keys_polled.c
@@
-305,7
+305,8
@@
static int gpio_keys_polled_probe(struct platform_device *pdev)
bdata->gpiod = devm_get_gpiod_from_child(dev, NULL,
child,
- GPIOD_IN);
+ GPIOD_IN,
+ button->desc);
if (IS_ERR(bdata->gpiod)) {
error = PTR_ERR(bdata->gpiod);
if (error != -EPROBE_DEFER)