From 1b9518293e3f829590bc8022bcbb73b4e561afe7 Mon Sep 17 00:00:00 2001
From: Mitsuru IWASAKI <iwasaki@FreeBSD.org>
Date: Sat, 15 Apr 2006 16:10:53 +0000
Subject: [PATCH] Oops, untested code was included accidentally. Fixed.

---
 sys/dev/acpica/acpi_cmbat.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/dev/acpica/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c
index 92a8db71528b..062926aa6321 100644
--- a/sys/dev/acpica/acpi_cmbat.c
+++ b/sys/dev/acpica/acpi_cmbat.c
@@ -157,9 +157,11 @@ acpi_cmbat_attach(device_t dev)
 static int
 acpi_cmbat_detach(device_t dev)
 {
+    ACPI_HANDLE	handle;
 
-    acpi_battery_remove(dev);
+    handle = acpi_get_handle(dev);
     AcpiRemoveNotifyHandler(handle, ACPI_ALL_NOTIFY, acpi_cmbat_notify_handler);
+    acpi_battery_remove(dev);
     return (0);
 }