---

yaml --- r: 250487 b: refs/heads/master c: 4671127 h: refs/heads/master i: 250485: 0d01aac 250483: e1fa413 250479: 5efebac v: v3
git-mirror · Apr 12, 2011 · b212f63 · b212f63
1 parent a415de3
commit b212f63
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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