CVS commit: [netbsd-5] src/sys/dev/acpi

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Sun Aug 30 03:03:33 UTC 2009

Modified Files:
        src/sys/dev/acpi [netbsd-5]: asus_acpi.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #891):
        sys/dev/acpi/asus_acpi.c: revision 1.9
don't call asus_sysctl_setup from asus_init because that is called from
the resume handler, instead call it directly from asus_attach


To generate a diff of this commit:
cvs rdiff -u -r1.6.4.2 -r1.6.4.3 src/sys/dev/acpi/asus_acpi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/acpi/asus_acpi.c
diff -u src/sys/dev/acpi/asus_acpi.c:1.6.4.2 src/sys/dev/acpi/asus_acpi.c:1.6.4.3
--- src/sys/dev/acpi/asus_acpi.c:1.6.4.2	Sun Aug 30 03:02:32 2009
+++ src/sys/dev/acpi/asus_acpi.c	Sun Aug 30 03:03:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: asus_acpi.c,v 1.6.4.2 2009/08/30 03:02:32 snj Exp $ */
+/* $NetBSD: asus_acpi.c,v 1.6.4.3 2009/08/30 03:03:33 snj Exp $ */
 
 /*-
  * Copyright (c) 2007, 2008, 2009 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.6.4.2 2009/08/30 03:02:32 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.6.4.3 2009/08/30 03:03:33 snj Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -134,6 +134,7 @@
 	aprint_normal("\n");
 
 	asus_init(self);
+	asus_sysctl_setup(sc);
 
 	sc->sc_smpsw_valid = true;
 	sc->sc_smpsw[ASUS_PSW_DISPLAY_CYCLE].smpsw_name =
@@ -263,8 +264,6 @@
 		return;
 
 	sc->sc_cfvnum = (cfv >> 8) & 0xff;
-
-	asus_sysctl_setup(sc);
 }
 
 static bool