aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2006-08-04 22:51:51 -0400
committerDmitry Torokhov <dtor@insightbb.com>2006-08-04 22:51:51 -0400
commit22479e1c0d111c60d29a4759408394cbdc7548a5 (patch)
treed8f3bb27d40fbd2e50ffaa7d9c4e8bc9c0883396 /drivers/char
parentMerge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus (diff)
downloadlinux-dev-22479e1c0d111c60d29a4759408394cbdc7548a5.tar.xz
linux-dev-22479e1c0d111c60d29a4759408394cbdc7548a5.zip
Input: keyboard - change to use kzalloc
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/keyboard.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index 30a745428a09..3e90aac37510 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -1297,9 +1297,9 @@ static struct input_handle *kbd_connect(struct input_handler *handler,
if (i == BTN_MISC && !test_bit(EV_SND, dev->evbit))
return NULL;
- if (!(handle = kmalloc(sizeof(struct input_handle), GFP_KERNEL)))
+ handle = kzalloc(sizeof(struct input_handle), GFP_KERNEL);
+ if (!handle)
return NULL;
- memset(handle, 0, sizeof(struct input_handle));
handle->dev = dev;
handle->handler = handler;