diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 15:49:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 15:49:19 -0400 |
commit | 9c8680e2cfbb60d5075f8caaf9d98276120bcc78 (patch) | |
tree | 1957cff26a46271d5b63a3c209629ddd7f9fe124 /drivers/input/evbug.c | |
parent | f900e5824a44ab65437b4f7e7c610b72f94820c5 (diff) | |
parent | b9ec4e109d7a342e83e1210e05797222e36555c3 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
* master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: (26 commits)
Input: add support for Braille devices
Input: synaptics - limit rate to 40pps on Toshiba Protege M300
Input: gamecon - add SNES mouse support
Input: make modalias code respect allowed buffer size
Input: convert /proc handling to seq_file
Input: limit attributes' output to PAGE_SIZE
Input: gameport - fix memory leak
Input: serio - fix memory leak
Input: zaurus keyboard driver updates
Input: i8042 - fix logic around pnp_register_driver()
Input: ns558 - fix logic around pnp_register_driver()
Input: pcspkr - separate device and driver registration
Input: atkbd - allow disabling on X86_PC (if EMBEDDED)
Input: atkbd - disable softrepeat for dumb keyboards
Input: atkbd - fix complaints about 'releasing unknown key 0x7f'
Input: HID - fix duplicate key mapping for Logitech UltraX remote
Input: use kzalloc() throughout the code
Input: fix input_free_device() implementation
Input: initialize serio and gameport at subsystem level
Input: uinput - semaphore to mutex conversion
...
Diffstat (limited to 'drivers/input/evbug.c')
-rw-r--r-- | drivers/input/evbug.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/evbug.c b/drivers/input/evbug.c index d7828936fd8f..07358fb51b82 100644 --- a/drivers/input/evbug.c +++ b/drivers/input/evbug.c | |||
@@ -49,9 +49,8 @@ static struct input_handle *evbug_connect(struct input_handler *handler, struct | |||
49 | { | 49 | { |
50 | struct input_handle *handle; | 50 | struct input_handle *handle; |
51 | 51 | ||
52 | if (!(handle = kmalloc(sizeof(struct input_handle), GFP_KERNEL))) | 52 | if (!(handle = kzalloc(sizeof(struct input_handle), GFP_KERNEL))) |
53 | return NULL; | 53 | return NULL; |
54 | memset(handle, 0, sizeof(struct input_handle)); | ||
55 | 54 | ||
56 | handle->dev = dev; | 55 | handle->dev = dev; |
57 | handle->handler = handler; | 56 | handle->handler = handler; |