From 94c413e91ef0bb2282817ca1cfdec435170712ce Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Wed, 13 Jul 2005 12:56:42 +0200
Subject: [PATCH] --- yaml --- r: 4779 b: refs/heads/master c:
 a61caa8523a76e497f6b2a05350c892bc5ee402c h: refs/heads/master i:   4777:
 6c84d1cfeb1113144000adfbe223106c5fa05e83   4775:
 40c13f02e21214926e54115b9e7fb51ba3463020 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/input/joystick/amijoy.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);