Merge /spare/repo/linux-2.6/

[linux-2.6-omap-h63xx.git] / drivers / input / joystick / amijoy.c

diff --git a/drivers/input/joystick/amijoy.c b/drivers/input/joystick/amijoy.c
index 033456bb9fe0d70faa00ea0fa0fced045d9b6a02..e996183c5b065a1f59df8afa09b4f63236fa3382 100644 (file)
--- a/drivers/input/joystick/amijoy.c
+++ b/drivers/input/joystick/amijoy.c
@@ -105,7 +105,7 @@ out:
 
 static void amijoy_close(struct input_dev *dev)
 {
-       down(&amijoysem);
+       down(&amijoy_sem);
        if (!--amijoy_used)
                free_irq(IRQ_AMIGA_VERTB, amijoy_interrupt);
        up(&amijoy_sem);