diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-19 17:49:39 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-19 17:49:39 -0400 |
| commit | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (patch) | |
| tree | 42a0c0408fcf76024eb6885a27d4f1ed0228abcf /drivers/input | |
| parent | ce625a801664d8ed7344117bbb57510e4e0e872c (diff) | |
| parent | f60f700876cd51de9de69f3a3c865d95e287a24d (diff) | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/joystick/amijoy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/amijoy.c b/drivers/input/joystick/amijoy.c index 033456bb9fe0..e996183c5b06 100644 --- a/drivers/input/joystick/amijoy.c +++ b/drivers/input/joystick/amijoy.c | |||
| @@ -105,7 +105,7 @@ out: | |||
| 105 | 105 | ||
| 106 | static void amijoy_close(struct input_dev *dev) | 106 | static void amijoy_close(struct input_dev *dev) |
| 107 | { | 107 | { |
| 108 | down(&amijoysem); | 108 | down(&amijoy_sem); |
| 109 | if (!--amijoy_used) | 109 | if (!--amijoy_used) |
| 110 | free_irq(IRQ_AMIGA_VERTB, amijoy_interrupt); | 110 | free_irq(IRQ_AMIGA_VERTB, amijoy_interrupt); |
| 111 | up(&amijoy_sem); | 111 | up(&amijoy_sem); |