summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/adbhid.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-31 07:30:32 +0100
committerDmitry Torokhov <dtor_core@ameritech.net>2005-10-31 07:30:32 +0100
commiteb16292ba8a6655a560ab10a7d73a7816f0c0ac0 (patch)
tree2e52f812f6d0b7ab4b2b06a71b676f36c5afa288 /drivers/macintosh/adbhid.c
parentInput: lkkbd - fix debug message in lkkbd_interrupt() (diff)
downloadlinux-eb16292ba8a6655a560ab10a7d73a7816f0c0ac0.tar.xz
linux-eb16292ba8a6655a560ab10a7d73a7816f0c0ac0.zip
Input: adbhid - fix OOPS introduced by dynalloc conversion
The problem is that adbhid[]->input is NULL, so the kernel oopses with a null pointer dereference as soon as a key is pressed. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/macintosh/adbhid.c')
-rw-r--r--drivers/macintosh/adbhid.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index cdb6d0283195..8f02c155fdc0 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -723,6 +723,7 @@ adbhid_input_register(int id, int default_id, int original_handler_id,
sprintf(hid->phys, "adb%d:%d.%02x/input", id, default_id, original_handler_id);
+ hid->input = input_dev;
hid->id = default_id;
hid->original_handler_id = original_handler_id;
hid->current_handler_id = current_handler_id;