hal: Branch 'master'

[David Zeuthen]

 hald/linux/addons/addon-macbook-backlight.c |    4 ++++
 1 files changed, 4 insertions(+)

New commits:
diff-tree f9d9cd823bcd0c52289780d99163dc85ebb56db6 (from be426425d6e3629b39b90c9a468a875e446f0785)
Author: Martin Szulecki <compiz at sukimashita.com>
Date:   Sun Jun 3 21:40:44 2007 -0400

    fix Macbook Backlight not working after waking up from suspend to ram

diff --git a/hald/linux/addons/addon-macbook-backlight.c b/hald/linux/addons/addon-macbook-backlight.c
index 4841f1d..e0f4230 100644
--- a/hald/linux/addons/addon-macbook-backlight.c
+++ b/hald/linux/addons/addon-macbook-backlight.c
@@ -160,6 +160,10 @@ backlight_set (long value)
 
 	max = register_get () >> 17;
 
+	/* after resume the register might be set to zero; fix this */
+	if (max == 0x00)
+		max = 0x94;
+
 	/* sanity check: this should always be 0x94 */
 	if (max != 0x94)
 		return FALSE;