[Hackndev-commit] SF.net SVN: hackndev: [798] linux4palm/linux/trunk/arch/arm/mach-pxa/ palmz72/palmz72_battery.c

[<hap...@us...>]

Revision: 798
          http://svn.sourceforge.net/hackndev/?rev=798&view=rev
Author:   happy-slapin
Date:     2007-02-08 12:03:13 -0800 (Thu, 08 Feb 2007)

Log Message:
-----------
z72: Allows battery driver to be compiled in kernel.
Btw, testing for module mode is required.

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_battery.c

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_battery.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_battery.c	2007-02-04 23:18:05 UTC (rev 797)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_battery.c	2007-02-08 20:03:13 UTC (rev 798)
@@ -202,6 +202,10 @@
 #endif
 static int __init palmz72_wm97xx_init(void)
 {
+#ifndef MODULE
+    int ret;
+#endif
+
     /* register battery to APM layer */
     bat.battery_registered = 0;
 
@@ -216,6 +220,12 @@
     apm_get_power_status_orig = apm_get_power_status;
     apm_get_power_status = palmz72_apm_get_power_status;
 #endif
+#ifndef MODULE
+    /* If we're in kernel, we could accidentally be run before wm97xx
+    and thus have panic */
+    if((ret = bus_register(&wm97xx_bus_type)) < 0)
+        return ret;
+#endif
     return driver_register(&palmz72_wm97xx_driver);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.