From: Andrew Morton <akpm@linux-foundation.org>

Cc: Andrew McNabb <amcnabb@mcnabbs.org>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/macintosh/adbhid.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff -puN drivers/macintosh/adbhid.c~adbhid-produce-all-capslock-key-events-fix drivers/macintosh/adbhid.c
--- a/drivers/macintosh/adbhid.c~adbhid-produce-all-capslock-key-events-fix
+++ a/drivers/macintosh/adbhid.c
@@ -52,7 +52,7 @@
 
 MODULE_AUTHOR("Franz Sirl <Franz.Sirl-kernel@lauterbach.com>");
 
-static int restore_capslock_events = 0;
+static int restore_capslock_events;
 module_param(restore_capslock_events, int, 0644);
 MODULE_PARM_DESC(restore_capslock_events,
 	"Produce keypress events for capslock on both keyup and keydown.");
@@ -284,8 +284,8 @@ adbhid_input_keycode(int id, int scancod
 	struct adbhid *ahid = adbhid[id];
 	int keycode, up_flag;
 
-	keycode = (scancode & 0x7f);
-	up_flag = (scancode & 0x80);
+	keycode = scancode & 0x7f;
+	up_flag = scancode & 0x80;
 
 	if (restore_capslock_events) {
 		if ((keycode == ADB_KEY_CAPSLOCK) && !up_flag) {
@@ -316,7 +316,8 @@ adbhid_input_keycode(int id, int scancod
 
 	switch (keycode) {
 	case ADB_KEY_CAPSLOCK:
-		if (restore_capslock_events) break;
+		if (restore_capslock_events)
+			break;
 		/* Generate down/up events for CapsLock everytime. */
 		input_report_key(ahid->input, KEY_CAPSLOCK, 1);
 		input_report_key(ahid->input, KEY_CAPSLOCK, 0);
_