diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2003-05-13 02:22:25 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2003-05-13 02:22:25 +0100 |
| commit | cb4169bc1fca8ee86e79ccfcc6a4586586cece42 (patch) | |
| tree | eddc1db4cf1bcea75be235db8b2a461581b4ee41 /drivers/char/nwbutton.c | |
| parent | d24804947d7844e4cf116cb1e42d7abed9b06c5e (diff) | |
[ARM] Update a variety of ARM drivers to use irqreturn_t.
Diffstat (limited to 'drivers/char/nwbutton.c')
| -rw-r--r-- | drivers/char/nwbutton.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c index f73ddbe43f8a..513777e538f6 100644 --- a/drivers/char/nwbutton.c +++ b/drivers/char/nwbutton.c @@ -146,7 +146,7 @@ static void button_sequence_finished (unsigned long parameters) * increments the counter. */ -static void button_handler (int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t button_handler (int irq, void *dev_id, struct pt_regs *regs) { if (button_press_count) { del_timer (&button_timer); @@ -156,6 +156,8 @@ static void button_handler (int irq, void *dev_id, struct pt_regs *regs) button_timer.function = button_sequence_finished; button_timer.expires = (jiffies + bdelay); add_timer (&button_timer); + + return IRQ_HANDLED; } /* |