dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

hwmon: (applesmc) Handle new temperature format 

The recent Macbooks have temperature registers of a new type.
This patch adds the logic to handle them.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
This commit is contained in:
Henrik Rydberg 2010-11-09 15:15:06 +00:00 committed by Guenter Roeck
parent 9792dadfce
commit dcdea2614a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/hwmon/applesmc.c
View File

@ -734,13 +734,19 @@ static ssize_t applesmc_show_temperature(struct device *dev,
entry = applesmc_get_entry_by_index(index);
if (IS_ERR(entry))
return PTR_ERR(entry);
if (entry->len > 2)
return -EINVAL;
ret = applesmc_read_entry(entry, buffer, 2);
ret = applesmc_read_entry(entry, buffer, entry->len);
if (ret)
return ret;
temp = buffer[0]*1000;
temp += (buffer[1] >> 6) * 250;
if (entry->len == 2) {
temp = buffer[0] * 1000;
temp += (buffer[1] >> 6) * 250;
} else {
temp = buffer[0] * 4000;
}
return snprintf(sysfsbuf, PAGE_SIZE, "%u\n", temp);
}