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;