From b0eced9993517135136ed36ef90abfc149b0fa2e Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Wed, 28 May 2008 00:54:01 -0400
Subject: [PATCH] --- yaml --- r: 97506 b: refs/heads/master c:
 57f5b1590f2d801a3a7f072e2c65f14d4545852c h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/input/keyboard/atkbd.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d5b532be0c40..50fa34d38f40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87a54a28970fb6a91de3993120eccc01a0ece732
+refs/heads/master: 57f5b1590f2d801a3a7f072e2c65f14d4545852c
diff --git a/trunk/drivers/input/keyboard/atkbd.c b/trunk/drivers/input/keyboard/atkbd.c
index 4a95adc4cc78..af58a6f1e898 100644
--- a/trunk/drivers/input/keyboard/atkbd.c
+++ b/trunk/drivers/input/keyboard/atkbd.c
@@ -807,6 +807,8 @@ static int atkbd_activate(struct atkbd *atkbd)
 static void atkbd_cleanup(struct serio *serio)
 {
 	struct atkbd *atkbd = serio_get_drvdata(serio);
+
+	atkbd_disable(atkbd);
 	ps2_command(&atkbd->ps2dev, NULL, ATKBD_CMD_RESET_BAT);
 }