Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 346976
b: refs/heads/master
c: 1a22e16
h: refs/heads/master
v: v3
  • Loading branch information
Alexander Shiyan authored and Dmitry Torokhov committed Nov 29, 2012
1 parent 4ab5a43 commit 3407bfc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 16ff7cb1848a8898ff19f77b4a9632a73ff98457
refs/heads/master: 1a22e16fc3d6abc8d6323cc0973435439932fe5f
5 changes: 4 additions & 1 deletion trunk/drivers/input/keyboard/gpio_keys_polled.c
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)

input = poll_dev->input;

input->evbit[0] = BIT(EV_KEY);
input->name = pdev->name;
input->phys = DRV_NAME"/input0";
input->dev.parent = &pdev->dev;
Expand All @@ -255,6 +254,10 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
input->id.product = 0x0001;
input->id.version = 0x0100;

__set_bit(EV_KEY, input->evbit);
if (pdata->rep)
__set_bit(EV_REP, input->evbit);

for (i = 0; i < pdata->nbuttons; i++) {
struct gpio_keys_button *button = &pdata->buttons[i];
struct gpio_keys_button_data *bdata = &bdev->data[i];
Expand Down

0 comments on commit 3407bfc

Please sign in to comment.