diff options
author | Peter Feuerer <peter@piie.net> | 2009-11-17 17:07:21 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-11-25 00:51:00 -0500 |
commit | 7005291706341a11c094f39a756a01c9e649e5f9 (patch) | |
tree | 0b8eed3790648b4435314e3a2659575ffda2707c /drivers/platform | |
parent | a8a8a669ea13d792296737505adc43ccacf3a648 (diff) |
acerhdf: return temperature in milidegree instead of degree
Return temperature in milidegree instead of degree, as sysfs-api requires
the temperature in milidegree.
Signed-off-by: Peter Feuerer <peter@piie.net>
Tested-by: Borislav Petkov <petkovbb@gmail.com>
Cc: Andreas Mohr <andi@lisas.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r-- | drivers/platform/x86/acerhdf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c index 0a8f735f6c4a..ab64522aaa64 100644 --- a/drivers/platform/x86/acerhdf.c +++ b/drivers/platform/x86/acerhdf.c | |||
@@ -52,7 +52,7 @@ | |||
52 | */ | 52 | */ |
53 | #undef START_IN_KERNEL_MODE | 53 | #undef START_IN_KERNEL_MODE |
54 | 54 | ||
55 | #define DRV_VER "0.5.17" | 55 | #define DRV_VER "0.5.18" |
56 | 56 | ||
57 | /* | 57 | /* |
58 | * According to the Atom N270 datasheet, | 58 | * According to the Atom N270 datasheet, |
@@ -61,7 +61,7 @@ | |||
61 | * measured by the on-die thermal monitor are within 0 <= Tj <= 90. So, | 61 | * measured by the on-die thermal monitor are within 0 <= Tj <= 90. So, |
62 | * assume 89°C is critical temperature. | 62 | * assume 89°C is critical temperature. |
63 | */ | 63 | */ |
64 | #define ACERHDF_TEMP_CRIT 89 | 64 | #define ACERHDF_TEMP_CRIT 89000 |
65 | #define ACERHDF_FAN_OFF 0 | 65 | #define ACERHDF_FAN_OFF 0 |
66 | #define ACERHDF_FAN_AUTO 1 | 66 | #define ACERHDF_FAN_AUTO 1 |
67 | 67 | ||
@@ -69,7 +69,7 @@ | |||
69 | * No matter what value the user puts into the fanon variable, turn on the fan | 69 | * No matter what value the user puts into the fanon variable, turn on the fan |
70 | * at 80 degree Celsius to prevent hardware damage | 70 | * at 80 degree Celsius to prevent hardware damage |
71 | */ | 71 | */ |
72 | #define ACERHDF_MAX_FANON 80 | 72 | #define ACERHDF_MAX_FANON 80000 |
73 | 73 | ||
74 | /* | 74 | /* |
75 | * Maximum interval between two temperature checks is 15 seconds, as the die | 75 | * Maximum interval between two temperature checks is 15 seconds, as the die |
@@ -85,8 +85,8 @@ static int kernelmode; | |||
85 | #endif | 85 | #endif |
86 | 86 | ||
87 | static unsigned int interval = 10; | 87 | static unsigned int interval = 10; |
88 | static unsigned int fanon = 63; | 88 | static unsigned int fanon = 63000; |
89 | static unsigned int fanoff = 58; | 89 | static unsigned int fanoff = 58000; |
90 | static unsigned int verbose; | 90 | static unsigned int verbose; |
91 | static unsigned int fanstate = ACERHDF_FAN_AUTO; | 91 | static unsigned int fanstate = ACERHDF_FAN_AUTO; |
92 | static char force_bios[16]; | 92 | static char force_bios[16]; |
@@ -171,7 +171,7 @@ static int acerhdf_get_temp(int *temp) | |||
171 | if (ec_read(bios_cfg->tempreg, &read_temp)) | 171 | if (ec_read(bios_cfg->tempreg, &read_temp)) |
172 | return -EINVAL; | 172 | return -EINVAL; |
173 | 173 | ||
174 | *temp = read_temp; | 174 | *temp = read_temp * 1000; |
175 | 175 | ||
176 | return 0; | 176 | return 0; |
177 | } | 177 | } |