summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/kempld_wdt.c
diff options
context:
space:
mode:
authorgundberg <per.gundberg@icomera.com>2014-04-24 15:49:19 +0200
committerWim Van Sebroeck <wim@iguana.be>2014-06-10 21:39:48 +0200
commita9e0436b303e94ba57d3bd4b1fcbeaa744b7ebeb (patch)
tree4fe3358139e525633c55d89579be918bfc07d97f /drivers/watchdog/kempld_wdt.c
parent51ee34ab583a602e35817c020bcc5c437da4a1ee (diff)
downloadlinux-a9e0436b303e94ba57d3bd4b1fcbeaa744b7ebeb.tar.bz2
watchdog: kempld-wdt: Use the correct value when configuring the prescaler with the watchdog
Use the prescaler index, rather than its value, to configure the watchdog. This will prevent a mismatch with the prescaler used to calculate the cycles. Signed-off-by: Per Gundberg <per.gundberg@icomera.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Michael Brunner <michael.brunner@kontron.com> Tested-by: Michael Brunner <michael.brunner@kontron.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Cc: stable <stable@vger.kernel.org>
Diffstat (limited to 'drivers/watchdog/kempld_wdt.c')
-rw-r--r--drivers/watchdog/kempld_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/kempld_wdt.c b/drivers/watchdog/kempld_wdt.c
index 20dc73844737..d9c1a1601926 100644
--- a/drivers/watchdog/kempld_wdt.c
+++ b/drivers/watchdog/kempld_wdt.c
@@ -162,7 +162,7 @@ static int kempld_wdt_set_stage_timeout(struct kempld_wdt_data *wdt_data,
kempld_get_mutex(pld);
stage_cfg = kempld_read8(pld, KEMPLD_WDT_STAGE_CFG(stage->id));
stage_cfg &= ~STAGE_CFG_PRESCALER_MASK;
- stage_cfg |= STAGE_CFG_SET_PRESCALER(prescaler);
+ stage_cfg |= STAGE_CFG_SET_PRESCALER(PRESCALER_21);
kempld_write8(pld, KEMPLD_WDT_STAGE_CFG(stage->id), stage_cfg);
kempld_write32(pld, KEMPLD_WDT_STAGE_TIMEOUT(stage->id),
stage_timeout);