summaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard
diff options
context:
space:
mode:
authorJean-François Dagenais <jeff.dagenais@gmail.com>2012-05-11 07:32:00 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-05-11 07:34:16 +0200
commitd0a3457d38adbad37e43ffe6b763360b2bfe71d9 (patch)
treeed1dcb47e63d38be8205c829564cde4247fc51bd /drivers/input/keyboard
parentInput: omap-keypad - dynamically handle register offsets (diff)
downloadlinux-d0a3457d38adbad37e43ffe6b763360b2bfe71d9.tar.xz
linux-d0a3457d38adbad37e43ffe6b763360b2bfe71d9.zip
Input: adp5588 - add support for gpio names
Signed-off-by: Jean-François Dagenais <jeff.dagenais@gmail.com> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/keyboard')
-rw-r--r--drivers/input/keyboard/adp5588-keys.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index 39ebffac207e..b083bf10f139 100644
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -197,6 +197,7 @@ static int __devinit adp5588_gpio_add(struct adp5588_kpad *kpad)
kpad->gc.base = gpio_data->gpio_start;
kpad->gc.label = kpad->client->name;
kpad->gc.owner = THIS_MODULE;
+ kpad->gc.names = gpio_data->names;
mutex_init(&kpad->gpio_lock);