8 files changed, 17 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 64240b5..6d9695d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME    = applesmc
-VERSION = 0.14.1
+VERSION = 0.14.2
 SRC     = usr/src
 
 TARBALL = $(NAME)-$(VERSION).dkms.tar.gz
diff --git a/debian/changelog b/debian/changelog
index f3c0464..680ced9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+applesmc-dkms (0.14.2) unstable; urgency=low
+
+  * Fix light sensor readings on newer MacBooks
+
+ -- Alex Murray <murray.alex@gmail.com>  Sun, 11 Jan 2009 20:42:03 +1030
+
 applesmc-dkms (0.14.1) unstable; urgency=low
 
   * Add support for MacBook Air 2
diff --git a/debian/postinst b/debian/postinst
index 6351864..89c94eb 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,7 +3,7 @@
 set -e
 
 NAME=applesmc
-VERSION=0.14.1
+VERSION=0.14.2
 
 case "$1" in
     configure)
diff --git a/debian/postrm b/debian/postrm
index 454faea..7f94688 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=applesmc
-VERSION=0.14.1
+VERSION=0.14.2
 
 set -e
 
diff --git a/debian/prerm b/debian/prerm
index 05315a4..a6cf719 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=applesmc
-VERSION=0.14.1
+VERSION=0.14.2
 
 set -e
 
diff --git a/debian/rules b/debian/rules
index c829ec6..9fdb303 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 NAME=applesmc
-VERSION=0.14.1
+VERSION=0.14.2
 
 configure: configure-stamp
 configure-stamp:
diff --git a/usr/src/dkms_source_tree/applesmc.c b/usr/src/dkms_source_tree/applesmc.c
index acd818f..ebf4c03 100644
--- a/usr/src/dkms_source_tree/applesmc.c
+++ b/usr/src/dkms_source_tree/applesmc.c
@@ -590,6 +590,11 @@ static ssize_t applesmc_light_show(struct device *dev,
         }
 
         ret = applesmc_read_key(LIGHT_SENSOR_LEFT_KEY, buffer, data_length);
+        /* newer macbooks report a single 10-bit bigendian value */
+        if (data_length == 10) {
+                left = be16_to_cpu(*(__be16 *)(buffer + 6)) >> 2;
+                goto out;
+        }
         left = buffer[2];
         if (ret)
                 goto out;
diff --git a/usr/src/dkms_source_tree/dkms.conf b/usr/src/dkms_source_tree/dkms.conf
index 06934cf..a94c408 100644
--- a/usr/src/dkms_source_tree/dkms.conf
+++ b/usr/src/dkms_source_tree/dkms.conf
@@ -1,5 +1,5 @@
 NAME=applesmc
-VERSION=0.14.1
+VERSION=0.14.2
 PACKAGE_NAME="$NAME"
 PACKAGE_VERSION="$VERSION"
 MAKE[0]="make -C ${kernel_source_dir}