[Pommed-commits] r330 - in trunk: . pommed/pmac

[jblache at alioth.debian.org]

Author: jblache
Date: 2007-05-19 17:09:13 +0000 (Sat, 19 May 2007)
New Revision: 330

Modified:
   trunk/ChangeLog
   trunk/pommed/pmac/kbd_backlight.c
Log:
fallback to of_find_node_by_name() for LMU controller detection; it seems some PowerBooks (5,4) do not have a node type associated with the node in the device-tree.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-05-12 15:39:27 UTC (rev 329)
+++ trunk/ChangeLog	2007-05-19 17:09:13 UTC (rev 330)
@@ -3,6 +3,9 @@
 
 version 1.5:
 	- pommed: back to using eject(1) for CD ejection.
+	- pommed: fallback to of_find_node_by_name() for LMU controller
+	detection; it seems some PowerBooks (5,4) do not have a node type
+	associated with the node in the device-tree.
 
 version 1.4:
 	- pommed: add proper support for the PowerBook5,8 and PowerBook5,9

Modified: trunk/pommed/pmac/kbd_backlight.c
===================================================================
--- trunk/pommed/pmac/kbd_backlight.c	2007-05-12 15:39:27 UTC (rev 329)
+++ trunk/pommed/pmac/kbd_backlight.c	2007-05-19 17:09:13 UTC (rev 330)
@@ -472,9 +472,13 @@
   node = of_find_node_by_type("lmu-controller", 0);
   if (node == NULL)
     {
-      logmsg(LOG_ERR, "Error: no lmu-controller found in device-tree");
+      node = of_find_node_by_name("lmu-controller", 0);
+      if (node == NULL)
+	{
+	  logmsg(LOG_ERR, "Error: no lmu-controller found in device-tree");
 
-      return -1;
+	  return -1;
+	}
     }
 
   reg = of_find_property(node, "reg", &plen);