From owner-svn-src-all@FreeBSD.ORG  Tue Apr 19 16:20:55 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D278F1065675;
	Tue, 19 Apr 2011 16:20:55 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C237C8FC1C;
	Tue, 19 Apr 2011 16:20:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3JGKtlD013427;
	Tue, 19 Apr 2011 16:20:55 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3JGKtGE013425;
	Tue, 19 Apr 2011 16:20:55 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201104191620.p3JGKtGE013425@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 19 Apr 2011 16:20:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220839 - head/sys/i386/bios
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Apr 2011 16:20:55 -0000

Author: jkim
Date: Tue Apr 19 16:20:55 2011
New Revision: 220839
URL: http://svn.freebsd.org/changeset/base/220839

Log:
  Add suspend/resume event handlers for apm(4) as well.

Modified:
  head/sys/i386/bios/apm.c

Modified: head/sys/i386/bios/apm.c
==============================================================================
--- head/sys/i386/bios/apm.c	Tue Apr 19 16:10:08 2011	(r220838)
+++ head/sys/i386/bios/apm.c	Tue Apr 19 16:20:55 2011	(r220839)
@@ -484,16 +484,16 @@ apm_do_suspend(void)
 	apm_op_inprog = 0;
 	sc->suspends = sc->suspend_countdown = 0;
 
+	EVENTHANDLER_INVOKE(power_suspend);
+
 	/*
 	 * Be sure to hold Giant across DEVICE_SUSPEND/RESUME since
 	 * non-MPSAFE drivers need this.
 	 */
 	mtx_lock(&Giant);
 	error = DEVICE_SUSPEND(root_bus);
-	if (error) {
-		mtx_unlock(&Giant);
-		return;
-	}
+	if (error)
+		goto backout;
 
 	apm_execute_hook(hook[APM_HOOK_SUSPEND]);
 	if (apm_suspend_system(PMST_SUSPEND) == 0) {
@@ -504,8 +504,9 @@ apm_do_suspend(void)
 		apm_execute_hook(hook[APM_HOOK_RESUME]);
 		DEVICE_RESUME(root_bus);
 	}
+backout:
 	mtx_unlock(&Giant);
-	return;
+	EVENTHANDLER_INVOKE(power_resume);
 }
 
 static void
@@ -612,7 +613,7 @@ apm_resume(void)
 	mtx_lock(&Giant);
 	DEVICE_RESUME(root_bus);
 	mtx_unlock(&Giant);
-	return;
+	EVENTHANDLER_INVOKE(power_resume);
 }