aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShuduo Sang <shuduo.sang@intel.com>2010-12-08 10:57:31 +0000
committerAlan Cox <alan@linux.intel.com>2010-12-08 10:57:31 +0000
commite9ecf6336cda1573ed009715dde17efa4d3af09c (patch)
treeed7170aeb7bda02ba845009cfa91ec7f4de40fac
parent25468ec39ce618a7696029a56193877e1c7a2caf (diff)
downloadmrst-s0i3-test-e9ecf6336cda1573ed009715dde17efa4d3af09c.tar.gz
mrst-s0i3-test-e9ecf6336cda1573ed009715dde17efa4d3af09c.tar.xz
mrst-s0i3-test-e9ecf6336cda1573ed009715dde17efa4d3af09c.zip
intel mid watchdog: fix check_timer_margin()
The check was backwards Signed-off-by: Shuduo Sang <shuduo.sang@intel.com>
-rw-r--r--drivers/watchdog/intel_scu_watchdog.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/intel_scu_watchdog.c b/drivers/watchdog/intel_scu_watchdog.c
index 33ad728e2fd..ff43e66ed88 100644
--- a/drivers/watchdog/intel_scu_watchdog.c
+++ b/drivers/watchdog/intel_scu_watchdog.c
@@ -448,7 +448,7 @@ static long intel_scu_ioctl(struct file *file,
if (get_user(new_margin, p))
return -EFAULT;
- if (!check_timer_margin(new_margin))
+ if (check_timer_margin(new_margin))
return -EINVAL;
if (intel_scu_set_heartbeat(new_margin))
@@ -506,7 +506,7 @@ static int __init intel_scu_watchdog_init(void)
}
/* Check value of timer_margin boot parameter */
- if (!check_timer_margin(timer_margin))
+ if (check_timer_margin(timer_margin))
return -EINVAL;
watchdog_device.timer_tbl_ptr = sfi_get_mtmr(sfi_mtimer_num-1);