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

[jblache at alioth.debian.org]

Author: jblache
Date: 2008-07-22 08:40:28 +0000 (Tue, 22 Jul 2008)
New Revision: 506

Modified:
   trunk/ChangeLog
   trunk/pommed/pmac/kbd_backlight.c
Log:
Do not probe for LMU controller on pmac machines without backlit keyboard.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-07-14 14:19:28 UTC (rev 505)
+++ trunk/ChangeLog	2008-07-22 08:40:28 UTC (rev 506)
@@ -2,6 +2,8 @@
 --------------------
 
 version 1.22:
+	- pommed: do not probe for LMU controller on pmac machines that do
+	not have a backlit keyboard. Avoids a spurious error message.
 
 version 1.21:
 	- gpomme: use compositing if available, patch by Soeren Sonnenburg.

Modified: trunk/pommed/pmac/kbd_backlight.c
===================================================================
--- trunk/pommed/pmac/kbd_backlight.c	2008-07-14 14:19:28 UTC (rev 505)
+++ trunk/pommed/pmac/kbd_backlight.c	2008-07-22 08:40:28 UTC (rev 506)
@@ -336,7 +336,8 @@
 
   kbd_bck_info.auto_on = 0;
 
-  if ((mops->type == MACHINE_POWERBOOK_58)
+  if (!has_kbd_backlight()
+      || (mops->type == MACHINE_POWERBOOK_58)
       || (mops->type == MACHINE_POWERBOOK_59))
     {
       /* Nothing to probe for the PMU05 machines */
@@ -345,7 +346,7 @@
   else
     ret = kbd_probe_lmu();
 
-  if ((!has_kbd_backlight()) || (ret < 0))
+  if (!has_kbd_backlight() || (ret < 0))
     {
       lmu_info.lmuaddr = 0;