From: gundberg Date: Thu, 24 Apr 2014 13:49:19 +0000 (+0200) Subject: watchdog: kempld-wdt: Use the correct value when configuring the prescaler with the... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4db7575e4dc72022c2c929765e3f424e0b139c3c;p=karo-tx-linux.git watchdog: kempld-wdt: Use the correct value when configuring the prescaler with the watchdog commit a9e0436b303e94ba57d3bd4b1fcbeaa744b7ebeb upstream. 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 Reviewed-by: Guenter Roeck Reviewed-by: Michael Brunner Tested-by: Michael Brunner Signed-off-by: Wim Van Sebroeck Signed-off-by: Greg Kroah-Hartman --- 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);