From 8413d4dc57dc88f7298d823cfad1aa3ee46b3ad9 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 26 Mar 2009 02:05:42 +0000 Subject: [PATCH] --- yaml --- r: 154408 b: refs/heads/master c: 5ba762c9bb3ce2cc11e9e111cb3c476e84b91668 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/wdrtas.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 32ee260d589a..43202fae6d01 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c16a74d423f584ed80815ee7b944f5b578dd37a +refs/heads/master: 5ba762c9bb3ce2cc11e9e111cb3c476e84b91668 diff --git a/trunk/drivers/watchdog/wdrtas.c b/trunk/drivers/watchdog/wdrtas.c index a4fe7a38d9b0..3bde56bce63a 100644 --- a/trunk/drivers/watchdog/wdrtas.c +++ b/trunk/drivers/watchdog/wdrtas.c @@ -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 */