diff options
author | Thomas White <taw@bitwiz.org.uk> | 2009-09-11 12:49:39 +0100 |
---|---|---|
committer | Thomas White <taw@bitwiz.org.uk> | 2009-09-11 12:49:39 +0100 |
commit | cd38bcdac64aec45575ed58de66db4a2fbf1914d (patch) | |
tree | 450333c7a1c67685db627edda3e1376a5bd46a2e /drivers/input/keyboard/neo1973kbd.c | |
parent | 166226209d59b1210cadfdec6b31e7d633100d9d (diff) | |
parent | a3587e4ed77974adfb057af261aaeea4022018e8 (diff) |
Merge commit 'remotes/openmoko/andy-tracking' into drm-tracking
Diffstat (limited to 'drivers/input/keyboard/neo1973kbd.c')
-rw-r--r-- | drivers/input/keyboard/neo1973kbd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c index a95dd5806d2..8756ae60910 100644 --- a/drivers/input/keyboard/neo1973kbd.c +++ b/drivers/input/keyboard/neo1973kbd.c @@ -75,7 +75,7 @@ static struct neo1973kbd_key keys[] = { [NEO1973_KEY_HOLD] = { .name = "Neo1973 HOLD button", .isr = neo1973kbd_default_key_irq, - .input_key = KEY_PAUSE, + .input_key = KEY_PLAY, }, [NEO1973_KEY_JACK] = { .name = "Neo1973 Headphone jack", @@ -161,7 +161,7 @@ static irqreturn_t neo1973kbd_default_key_irq(int irq, void *dev_id) continue; input_report_key(kbd->input, keys[n].input_key, - gpio_get_value(kbd->pdev->resource[n].start)); + !gpio_get_value(kbd->pdev->resource[n].start)); input_sync(kbd->input); } @@ -346,7 +346,7 @@ static int neo1973kbd_probe(struct platform_device *pdev) input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_SW); set_bit(SW_HEADPHONE_INSERT, input_dev->swbit); set_bit(KEY_PHONE, input_dev->keybit); - set_bit(KEY_PAUSE, input_dev->keybit); + set_bit(KEY_PLAY, input_dev->keybit); rc = input_register_device(neo1973kbd->input); if (rc) |