From: Pete Zaitcev <zaitcev@redhat.com>
Date: Fri, 29 Jul 2005 19:18:34 +0000 (-0700)
Subject: [PATCH] USB: hidinput_hid_event() oops fix
X-Git-Tag: v2.6.13-rc5~71
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a9b2e9170bdf1dd27ca4aa9a63048065d252d116;p=linux.git

[PATCH] USB: hidinput_hid_event() oops fix

It seems that I see a bug in hidinput_hid_event.  The check for NULL can never
work, becaue &hidinput->input is nonzero at all times.

Cc: <vojtech@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/usb/input/hid-input.c b/drivers/usb/input/hid-input.c
index e071c8eeccee..63a4db721f7e 100644
--- a/drivers/usb/input/hid-input.c
+++ b/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);