From 30cf2a749ac61f926696ea0571842397d32cd9cc Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Fri, 4 Aug 2006 22:51:51 -0400 Subject: [PATCH] --- yaml --- r: 33195 b: refs/heads/master c: 22479e1c0d111c60d29a4759408394cbdc7548a5 h: refs/heads/master i: 33193: 79cd25910977cbb5aeac72d557bd3d8e543c6c07 33191: f865f261bdd07de4feb338d7b3618a1202c9fb33 v: v3 --- [refs] | 2 +- trunk/drivers/char/keyboard.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 571606cfcf8d..35542947ee2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d932cb7e630cae3b6b5307b767d296ff1a597c5e +refs/heads/master: 22479e1c0d111c60d29a4759408394cbdc7548a5 diff --git a/trunk/drivers/char/keyboard.c b/trunk/drivers/char/keyboard.c index 30a745428a09..3e90aac37510 100644 --- a/trunk/drivers/char/keyboard.c +++ b/trunk/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;