summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumarg@android.com>2011-09-21 17:18:56 -0700
committerColin Cross <ccross@android.com>2012-04-09 13:57:58 -0700
commit5c580171c6f7b97dd14aec169338cc135279bcca (patch)
tree1fbee5aea11c307e980afb1ec266c7124b70f38a
parent420359667ce49da1f5d6b081abf5cb6db0d7b700 (diff)
HID: Add null check for hidinput.
Add null check for hidinput before calling input_register. Change-Id: Ib3fc0507e4091192360f3395d13d489db9b5a4d2 Signed-off-by: Jaikumar Ganesh <jaikumarg@android.com>
-rw-r--r--drivers/hid/hid-input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 9317156d9db..c19bff70ce7 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -1218,7 +1218,7 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)
goto out_unwind;
}
- if (hid->driver->input_register &&
+ if (hidinput && hid->driver->input_register &&
hid->driver->input_register(hid, hidinput))
goto out_cleanup;