diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-31 01:30:32 -0500 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-10-31 01:30:32 -0500 |
commit | eb16292ba8a6655a560ab10a7d73a7816f0c0ac0 (patch) | |
tree | 2e52f812f6d0b7ab4b2b06a71b676f36c5afa288 /drivers/macintosh | |
parent | 76440d5e13d7dacd5763394ddb2071424e0b6921 (diff) |
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')
-rw-r--r-- | drivers/macintosh/adbhid.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c index cdb6d028319..8f02c155fdc 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, | |||
723 | 723 | ||
724 | sprintf(hid->phys, "adb%d:%d.%02x/input", id, default_id, original_handler_id); | 724 | sprintf(hid->phys, "adb%d:%d.%02x/input", id, default_id, original_handler_id); |
725 | 725 | ||
726 | hid->input = input_dev; | ||
726 | hid->id = default_id; | 727 | hid->id = default_id; |
727 | hid->original_handler_id = original_handler_id; | 728 | hid->original_handler_id = original_handler_id; |
728 | hid->current_handler_id = current_handler_id; | 729 | hid->current_handler_id = current_handler_id; |