summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorAlexander Stein <alexander.stein@informatik.tu-chemnitz.de>2011-04-11 23:34:48 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-04-11 23:53:19 -0700
commit467112777c462a592c27338eeea5d1a320e82b5f (patch)
treeb2ee72c67ecdc46ebb62edb042aa22af434a7350 /drivers/input
parent92a47674f57b4a84a43ce93b0dfdb596c0543749 (diff)
Input: gpio-keys - add support for setting device name
This patch allows to set a device name which helps distinguishing several gpio-keys devices. Signed-off-by: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/gpio_keys.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 73e58a96ab99..6e6145b9a4c1 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -473,7 +473,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, ddata);
input_set_drvdata(input, ddata);
- input->name = pdev->name;
+ input->name = pdata->name ? : pdev->name;
input->phys = "gpio-keys/input0";
input->dev.parent = &pdev->dev;
input->open = gpio_keys_open;