diff --git a/[refs] b/[refs]
index 794a09b6e2d4..0b0b82ce5eba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f264cc28245d4d635d586be8c2148140726756dd
+refs/heads/master: a61caa8523a76e497f6b2a05350c892bc5ee402c
diff --git a/trunk/drivers/input/joystick/amijoy.c b/trunk/drivers/input/joystick/amijoy.c
index 033456bb9fe0..e996183c5b06 100644
--- a/trunk/drivers/input/joystick/amijoy.c
+++ b/trunk/drivers/input/joystick/amijoy.c
@@ -105,7 +105,7 @@ static int amijoy_open(struct input_dev *dev)
 
 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);