From fe917e2f4c829962090cdb9bcc83079c0c5f46a9 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke <grumbel@gmail.com>
Date: Mon, 29 Oct 2012 14:29:30 +0100
Subject: [PATCH] --- yaml --- r: 343105 b: refs/heads/master c:
 f8e86d054686d9090549476ea2394aa04c614a93 h: refs/heads/master i:   343103:
 78a23cc7fde58b3761cb720e1a92c601832c9e3b v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/hid/hid-input.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a3878f060efb..79d585d749c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c10354d4a6c9256c3393feafcbd030cb392a9baf
+refs/heads/master: f8e86d054686d9090549476ea2394aa04c614a93
diff --git a/trunk/drivers/hid/hid-input.c b/trunk/drivers/hid/hid-input.c
index d917c0d53685..10248cf548fc 100644
--- a/trunk/drivers/hid/hid-input.c
+++ b/trunk/drivers/hid/hid-input.c
@@ -502,9 +502,14 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 				if (code <= 0xf)
 					code += BTN_JOYSTICK;
 				else
-					code += BTN_TRIGGER_HAPPY;
+					code += BTN_TRIGGER_HAPPY - 0x10;
+				break;
+		case HID_GD_GAMEPAD:
+				if (code <= 0xf)
+					code += BTN_GAMEPAD;
+				else
+					code += BTN_TRIGGER_HAPPY - 0x10;
 				break;
-		case HID_GD_GAMEPAD:  code += BTN_GAMEPAD; break;
 		default:
 			switch (field->physical) {
 			case HID_GD_MOUSE: