[Pommed-commits] r537 - in trunk: . pommed pommed/mactel

[jblache at alioth.debian.org]

Author: jblache
Date: 2008-12-29 11:16:04 +0000 (Mon, 29 Dec 2008)
New Revision: 537

Modified:
   trunk/ChangeLog
   trunk/pommed/mactel/gma950_backlight.c
   trunk/pommed/mactel/nv8600mgt_backlight.c
   trunk/pommed/mactel/x1600_backlight.c
   trunk/pommed/sysfs_backlight.c
Log:
Don't act on AC/battery switch if the backlight is off.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-12-29 11:12:06 UTC (rev 536)
+++ trunk/ChangeLog	2008-12-29 11:16:04 UTC (rev 537)
@@ -3,7 +3,7 @@
 
 version 1.25:
 	- pommed: check current hardware backlight level before setting AC
-	or battery level.
+	or battery level. Do not act if the backlight is off.
 
 version 1.24:
 	- pommed: add new path for fnmode setting for 2.6.28.

Modified: trunk/pommed/mactel/gma950_backlight.c
===================================================================
--- trunk/pommed/mactel/gma950_backlight.c	2008-12-29 11:12:06 UTC (rev 536)
+++ trunk/pommed/mactel/gma950_backlight.c	2008-12-29 11:16:04 UTC (rev 537)
@@ -229,6 +229,9 @@
       lcd_bck_info.level = val;
     }
 
+  if (lcd_bck_info.level == 0)
+    return;
+
   switch (lvl)
     {
       case LCD_ON_AC_LEVEL:

Modified: trunk/pommed/mactel/nv8600mgt_backlight.c
===================================================================
--- trunk/pommed/mactel/nv8600mgt_backlight.c	2008-12-29 11:12:06 UTC (rev 536)
+++ trunk/pommed/mactel/nv8600mgt_backlight.c	2008-12-29 11:16:04 UTC (rev 537)
@@ -143,6 +143,9 @@
       lcd_bck_info.level = val;
     }
 
+  if (lcd_bck_info.level == 0)
+    return;
+
   switch (lvl)
     {
       case LCD_ON_AC_LEVEL:

Modified: trunk/pommed/mactel/x1600_backlight.c
===================================================================
--- trunk/pommed/mactel/x1600_backlight.c	2008-12-29 11:12:06 UTC (rev 536)
+++ trunk/pommed/mactel/x1600_backlight.c	2008-12-29 11:16:04 UTC (rev 537)
@@ -194,6 +194,9 @@
       lcd_bck_info.level = val;
     }
 
+  if (lcd_bck_info.level == 0)
+    return;
+
   switch (lvl)
     {
       case LCD_ON_AC_LEVEL:

Modified: trunk/pommed/sysfs_backlight.c
===================================================================
--- trunk/pommed/sysfs_backlight.c	2008-12-29 11:12:06 UTC (rev 536)
+++ trunk/pommed/sysfs_backlight.c	2008-12-29 11:16:04 UTC (rev 537)
@@ -236,6 +236,9 @@
       lcd_bck_info.level = val;
     }
 
+  if (lcd_bck_info.level == 0)
+    return;
+
   switch (lvl)
     {
       case LCD_ON_AC_LEVEL: