aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2008-10-18 23:27:39 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-20 11:52:35 -0400
commit8bd1a12a51871f0c870612d8220b1485d6aefc73 (patch)
tree173aa85efcf75f5f825ea6bf4cb6277df8ba81ad /drivers
parent02fcbd144d684167aa67b1d3ad68f18d265f2d08 (diff)
hwmon: applesmc: allow for variable ALV0 and ALV1 package length
On some recent Macbooks, the package length for the light sensors ALV0 and ALV1 has changed from 6 to 10. This patch allows for a variable package length encompassing both variants. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Cc: Nicolas Boichat <nicolas@boichat.ch> Cc: Riki Oktarianto <rkoktarianto@gmail.com> Cc: Mark M. Hoffman <mhoffman@lightlink.com> Cc: Jean Delvare <khali@linux-fr.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/applesmc.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index 9a43c4b60ea9..de696b67a4fc 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -57,8 +57,8 @@
57 57
58#define KEY_COUNT_KEY "#KEY" /* r-o ui32 */ 58#define KEY_COUNT_KEY "#KEY" /* r-o ui32 */
59 59
60#define LIGHT_SENSOR_LEFT_KEY "ALV0" /* r-o {alv (6 bytes) */ 60#define LIGHT_SENSOR_LEFT_KEY "ALV0" /* r-o {alv (6-10 bytes) */
61#define LIGHT_SENSOR_RIGHT_KEY "ALV1" /* r-o {alv (6 bytes) */ 61#define LIGHT_SENSOR_RIGHT_KEY "ALV1" /* r-o {alv (6-10 bytes) */
62#define BACKLIGHT_KEY "LKSB" /* w-o {lkb (2 bytes) */ 62#define BACKLIGHT_KEY "LKSB" /* w-o {lkb (2 bytes) */
63 63
64#define CLAMSHELL_KEY "MSLD" /* r-o ui8 (unused) */ 64#define CLAMSHELL_KEY "MSLD" /* r-o ui8 (unused) */
@@ -543,17 +543,27 @@ out:
543static ssize_t applesmc_light_show(struct device *dev, 543static ssize_t applesmc_light_show(struct device *dev,
544 struct device_attribute *attr, char *sysfsbuf) 544 struct device_attribute *attr, char *sysfsbuf)
545{ 545{
546 static int data_length;
546 int ret; 547 int ret;
547 u8 left = 0, right = 0; 548 u8 left = 0, right = 0;
548 u8 buffer[6]; 549 u8 buffer[10], query[6];
549 550
550 mutex_lock(&applesmc_lock); 551 mutex_lock(&applesmc_lock);
551 552
552 ret = applesmc_read_key(LIGHT_SENSOR_LEFT_KEY, buffer, 6); 553 if (!data_length) {
554 ret = applesmc_get_key_type(LIGHT_SENSOR_LEFT_KEY, query);
555 if (ret)
556 goto out;
557 data_length = clamp_val(query[0], 0, 10);
558 printk(KERN_INFO "applesmc: light sensor data length set to "
559 "%d\n", data_length);
560 }
561
562 ret = applesmc_read_key(LIGHT_SENSOR_LEFT_KEY, buffer, data_length);
553 left = buffer[2]; 563 left = buffer[2];
554 if (ret) 564 if (ret)
555 goto out; 565 goto out;
556 ret = applesmc_read_key(LIGHT_SENSOR_RIGHT_KEY, buffer, 6); 566 ret = applesmc_read_key(LIGHT_SENSOR_RIGHT_KEY, buffer, data_length);
557 right = buffer[2]; 567 right = buffer[2];
558 568
559out: 569out: