From: Henrik Rydberg <rydberg@euromail.se>
Date: Tue, 9 Nov 2010 15:15:06 +0000 (+0000)
Subject: hwmon: (applesmc) Handle new temperature format
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dcdea2614ab9b7864a3ae620419d04e0cc4a65cc;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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>
---

diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index 03c24b7c9cbd..1d7f8aff9982 100644
--- a/drivers/hwmon/applesmc.c
+++ b/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);
 }