From: Alexander Polakov <polachok@gmail.com>
Date: Thu, 15 Oct 2009 17:25:03 +0000 (+0400)
Subject: atkbd: fix resume from ACPI S3
X-Git-Url: https://gitweb.dragonflybsd.org/~polachok/dragonfly.git/commitdiff_plain/61716ec7f47b673b2c99f18fa7251858567e9038

atkbd: fix resume from ACPI S3
---

diff --git a/sys/dev/misc/atkbd/atkbd_isa.c b/sys/dev/misc/atkbd/atkbd_isa.c
index 02eaa64418..f3915f8790 100644
--- a/sys/dev/misc/atkbd/atkbd_isa.c
+++ b/sys/dev/misc/atkbd/atkbd_isa.c
@@ -120,13 +120,23 @@ atkbdattach(device_t dev)
 static int
 atkbdresume(device_t dev)
 {
-	keyboard_t *kbd;
-
-	kbd = kbd_get_keyboard(kbd_find_keyboard(ATKBD_DRIVER_NAME,
-						 device_get_unit(dev)));
-	if (kbd)
-		kbd_clear_state(kbd);
-	return 0;
+        atkbd_softc_t *sc;
+        keyboard_t *kbd;
+        int args[2];
+
+        sc = device_get_softc(dev);
+        kbd = kbd_get_keyboard(kbd_find_keyboard(ATKBD_DRIVER_NAME,
+                                                 device_get_unit(dev)));
+        if (kbd) {
+                kbd->kb_flags &= ~KB_INITIALIZED;
+                args[0] = device_get_unit(device_get_parent(dev));
+                args[1] = rman_get_start(sc->intr);
+		(*kbdsw[kbd->kb_index]->init)(device_get_unit(dev), &kbd,
+                                              args, device_get_flags(dev));
+		(*kbdsw[kbd->kb_index]->clear_state)(kbd);
+
+        }
+        return 0;
 }
 
 static void