patch-2.4.10 linux/drivers/acpi/ospm/ec/ec_osl.c

Next file: linux/drivers/acpi/ospm/ec/ecgpe.c
Previous file: linux/drivers/acpi/ospm/button/bn_osl.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/drivers/acpi/ospm/ec/ec_osl.c linux/drivers/acpi/ospm/ec/ec_osl.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  *
  * Module Name: ec_osl.c
- *   $Revision: 6 $
+ *   $Revision: 10 $
  *
  *****************************************************************************/
 
@@ -36,6 +36,7 @@
 
 MODULE_AUTHOR("Andrew Grover");
 MODULE_DESCRIPTION("ACPI Component Architecture (CA) - Embedded Controller Driver");
+MODULE_LICENSE("GPL");
 
 #ifdef ACPI_DEBUG
 
@@ -55,6 +56,8 @@
 static u32			save_dbg_level;
 #endif /*ACPI_DEBUG*/
 
+extern struct proc_dir_entry	*bm_proc_root;
+
 
 /****************************************************************************
  *
@@ -68,10 +71,14 @@
  *
  ****************************************************************************/
 
-static int __init 
+static int __init
 ec_osl_init (void)
 {
-	ACPI_STATUS		status = AE_OK;
+	acpi_status		status = AE_OK;
+
+	/* abort if no busmgr */
+	if (!bm_proc_root)
+		return -ENODEV;
 
 #ifdef ACPI_DEBUG
 	save_dbg_layer = acpi_dbg_layer;
@@ -98,7 +105,7 @@
  *
  ****************************************************************************/
 
-static void __exit 
+static void __exit
 ec_osl_cleanup(void)
 {
 	ec_terminate();

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)