aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumarg@android.com>2011-09-21 17:18:56 -0700
committerJaikumar Ganesh <jaikumarg@android.com>2011-09-21 17:19:38 -0700
commit6c6f91c5330263a0be0ad99a84755c342b395d49 (patch)
treeb11e81a39e26c7358537260c76f89d311591bf9b /drivers/hid
parent786240ce3b46476dccf286f689c8b58fcdb09488 (diff)
downloadkernel_samsung_aries-6c6f91c5330263a0be0ad99a84755c342b395d49.zip
kernel_samsung_aries-6c6f91c5330263a0be0ad99a84755c342b395d49.tar.gz
kernel_samsung_aries-6c6f91c5330263a0be0ad99a84755c342b395d49.tar.bz2
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>
Diffstat (limited to 'drivers/hid')
-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 1b71bcd..1483c82 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -981,7 +981,7 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)
}
}
- if (hid->driver->input_register &&
+ if (hidinput && hid->driver->input_register &&
hid->driver->input_register(hid, hidinput))
goto out_cleanup;