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>

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;