diff --git a/[refs] b/[refs]
index 679ebb974486..f076e43abc46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 498f78e6fcf558d0dec31f5648f43426ae16433f
+refs/heads/master: a9b2e9170bdf1dd27ca4aa9a63048065d252d116
diff --git a/trunk/drivers/usb/input/hid-input.c b/trunk/drivers/usb/input/hid-input.c
index e071c8eeccee..63a4db721f7e 100644
--- a/trunk/drivers/usb/input/hid-input.c
+++ b/trunk/drivers/usb/input/hid-input.c
@@ -398,11 +398,12 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 
 void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value, struct pt_regs *regs)
 {
-	struct input_dev *input = &field->hidinput->input;
+	struct input_dev *input;
 	int *quirks = &hid->quirks;
 
-	if (!input)
+	if (!field->hidinput)
 		return;
+	input = &field->hidinput->input;
 
 	input_regs(input, regs);