From b212f63a552cc0c1eb3c2b1f357a7a752318b228 Mon Sep 17 00:00:00 2001 From: Alexander Stein Date: Mon, 11 Apr 2011 23:34:48 -0700 Subject: [PATCH] --- yaml --- r: 250487 b: refs/heads/master c: 467112777c462a592c27338eeea5d1a320e82b5f h: refs/heads/master i: 250485: 0d01aac984cce5a35c919ad573ad32b59f742947 250483: e1fa41331508a4c1cc9d7b0b281e3631696837a9 250479: 5efebacc6aa149ff8a2f369a7146a7ae0c4d96ce v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/gpio_keys.c | 2 +- trunk/include/linux/gpio_keys.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 38c2421c319c..a9738aa43b54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92a47674f57b4a84a43ce93b0dfdb596c0543749 +refs/heads/master: 467112777c462a592c27338eeea5d1a320e82b5f diff --git a/trunk/drivers/input/keyboard/gpio_keys.c b/trunk/drivers/input/keyboard/gpio_keys.c index 73e58a96ab99..6e6145b9a4c1 100644 --- a/trunk/drivers/input/keyboard/gpio_keys.c +++ b/trunk/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; diff --git a/trunk/include/linux/gpio_keys.h b/trunk/include/linux/gpio_keys.h index 3204edfe6b19..b5ca4b2c08ec 100644 --- a/trunk/include/linux/gpio_keys.h +++ b/trunk/include/linux/gpio_keys.h @@ -22,6 +22,7 @@ struct gpio_keys_platform_data { unsigned int rep:1; /* enable input subsystem auto repeat */ int (*enable)(struct device *dev); void (*disable)(struct device *dev); + const char *name; /* input device name */ }; #endif