Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 154408
b: refs/heads/master
c: 5ba762c
h: refs/heads/master
v: v3
  • Loading branch information
Adrian Reber authored and Benjamin Herrenschmidt committed Jun 26, 2009
1 parent 7a58dcf commit 8413d4d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6c16a74d423f584ed80815ee7b944f5b578dd37a
refs/heads/master: 5ba762c9bb3ce2cc11e9e111cb3c476e84b91668
8 changes: 3 additions & 5 deletions trunk/drivers/watchdog/wdrtas.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,16 +218,14 @@ static void wdrtas_timer_keepalive(void)
*/
static int wdrtas_get_temperature(void)
{
long result;
int result;
int temperature = 0;

result = rtas_call(wdrtas_token_get_sensor_state, 2, 2,
(void *)__pa(&temperature),
WDRTAS_THERMAL_SENSOR, 0);
result = rtas_get_sensor(WDRTAS_THERMAL_SENSOR, 0, &temperature);

if (result < 0)
printk(KERN_WARNING "wdrtas: reading the thermal sensor "
"faild: %li\n", result);
"failed: %i\n", result);
else
temperature = ((temperature * 9) / 5) + 32; /* fahrenheit */

Expand Down

0 comments on commit 8413d4d

Please sign in to comment.