From 95fda03832622be2da9b62bd11c1d9953c596002 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Tue, 9 Nov 2010 15:15:06 +0000 Subject: [PATCH] --- yaml --- r: 227767 b: refs/heads/master c: dcdea2614ab9b7864a3ae620419d04e0cc4a65cc h: refs/heads/master i: 227765: f6d5b133aea3a7092ea74a85e7f30ef76b3184e5 227763: 6c93bc60ab11454c67694e01f0db8d7f0d2d7c5c 227759: 054a057ac657a02b5edf8d9d9a3cac8d54b4f7de v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/applesmc.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 887bd80fb202..92dc929bc7a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9792dadfce22ae1518c88577ac743a3077a85084 +refs/heads/master: dcdea2614ab9b7864a3ae620419d04e0cc4a65cc diff --git a/trunk/drivers/hwmon/applesmc.c b/trunk/drivers/hwmon/applesmc.c index 03c24b7c9cbd..1d7f8aff9982 100644 --- a/trunk/drivers/hwmon/applesmc.c +++ b/trunk/drivers/hwmon/applesmc.c @@ -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); }