From 79222b0b428dcb7331ecb4a547255b33d77342d7 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 30 Aug 2007 00:04:33 -0400
Subject: [PATCH] --- yaml --- r: 64583 b: refs/heads/master c:
 d9f03831e7dc743ae25863c59f38884f5989ab39 h: refs/heads/master i:   64581:
 5fb52aeb7da9a4bf31ef7e01ff9a74c48e4414a9   64579:
 f3765233db270504659e427eb2eade8365e5bc65   64575:
 e74a23dbea1e43175f63e901f7c66e5a5c2860d8 v: v3

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

diff --git a/[refs] b/[refs]
index 1cc65f80ecaf..fa161541289c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3758b2ab61b3001b9db4582559bbaeba5e24a29
+refs/heads/master: d9f03831e7dc743ae25863c59f38884f5989ab39
diff --git a/trunk/drivers/input/joystick/iforce/iforce-packets.c b/trunk/drivers/input/joystick/iforce/iforce-packets.c
index 3154ccd74000..45c4939ced75 100644
--- a/trunk/drivers/input/joystick/iforce/iforce-packets.c
+++ b/trunk/drivers/input/joystick/iforce/iforce-packets.c
@@ -246,13 +246,12 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data)
 
 int iforce_get_id_packet(struct iforce *iforce, char *packet)
 {
-	int status;
-
 	switch (iforce->bus) {
 
-	case IFORCE_USB:
-
+	case IFORCE_USB: {
 #ifdef CONFIG_JOYSTICK_IFORCE_USB
+		int status;
+
 		iforce->cr.bRequest = packet[0];
 		iforce->ctrl->dev = iforce->usbdev;
 
@@ -273,6 +272,7 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
 #else
 		dbg("iforce_get_id_packet: iforce->bus = USB!");
 #endif
+		}
 		break;
 
 	case IFORCE_232: