diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 11:05:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 11:05:21 -0800 |
| commit | b31a0fecd1dd01f1db406014a7c8a73983e04cc9 (patch) | |
| tree | 745a5b75742da6661e5a0e13bb50cb20025d919a /Documentation | |
| parent | 96b8936a9ed08746e47081458a5eb9e43a751e24 (diff) | |
| parent | 545f4e99dee7284ed57c79384c5c1d5ac58dcd59 (diff) | |
| download | blackbird-op-linux-b31a0fecd1dd01f1db406014a7c8a73983e04cc9.tar.gz blackbird-op-linux-b31a0fecd1dd01f1db406014a7c8a73983e04cc9.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: wacom - add support for new USB Tablet PCs
Input: replace spin_lock_bh with spin_lock_irqsave in ml_ff_playback
Input: i8042 - add Compal Hel80 laptop to nomux blacklist
Input: cm109 - add keymap for ATCom AU-100 phone
Input: fix the example of an input device driver
Input: psmouse - fix incorrect validate_byte check in OLPC protocol
Input: atkbd - cancel delayed work before freeing its structure
Input: atkbd - add keymap quirk for Inventec Symphony systems
Input: i8042 - add Dell XPS M1530 to nomux list
Input: elo - fix format string in elo driver
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/input/input-programming.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/input/input-programming.txt b/Documentation/input/input-programming.txt index 81905e81585e..7f8b9d97bc47 100644 --- a/Documentation/input/input-programming.txt +++ b/Documentation/input/input-programming.txt @@ -20,10 +20,11 @@ pressed or released a BUTTON_IRQ happens. The driver could look like: static struct input_dev *button_dev; -static void button_interrupt(int irq, void *dummy, struct pt_regs *fp) +static irqreturn_t button_interrupt(int irq, void *dummy) { input_report_key(button_dev, BTN_0, inb(BUTTON_PORT) & 1); input_sync(button_dev); + return IRQ_HANDLED; } static int __init button_init(void) |
