Messages in this thread Patch in this message | | | From | Andrew Bresticker <> | Subject | [PATCH V2 1/3] watchdog: imgpdc: Allow timeout to be set in device-tree | Date | Wed, 1 Apr 2015 10:43:14 -0700 |
| |
Since the heartbeat is statically initialized to its default value, watchdog_init_timeout() will never look in the device-tree for a timeout-sec value. Instead of statically initializing heartbeat, fall back to the default timeout value if watchdog_init_timeout() fails.
Signed-off-by: Andrew Bresticker <abrestic@chromium.org> Cc: Ezequiel Garcia <ezequiel.garcia@imgtec.com> Cc: James Hogan <james.hogan@imgtec.com> --- New for v2. --- drivers/watchdog/imgpdc_wdt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/watchdog/imgpdc_wdt.c b/drivers/watchdog/imgpdc_wdt.c index 0deaa4f..89b2abc 100644 --- a/drivers/watchdog/imgpdc_wdt.c +++ b/drivers/watchdog/imgpdc_wdt.c @@ -42,7 +42,7 @@ #define PDC_WDT_MIN_TIMEOUT 1 #define PDC_WDT_DEF_TIMEOUT 64 -static int heartbeat = PDC_WDT_DEF_TIMEOUT; +static int heartbeat; module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds " "(default=" __MODULE_STRING(PDC_WDT_DEF_TIMEOUT) ")"); @@ -195,9 +195,9 @@ static int pdc_wdt_probe(struct platform_device *pdev) ret = watchdog_init_timeout(&pdc_wdt->wdt_dev, heartbeat, &pdev->dev); if (ret < 0) { - pdc_wdt->wdt_dev.timeout = pdc_wdt->wdt_dev.max_timeout; + pdc_wdt->wdt_dev.timeout = PDC_WDT_DEF_TIMEOUT; dev_warn(&pdev->dev, - "Initial timeout out of range! setting max timeout\n"); + "Initial timeout out of range! setting default timeout\n"); } pdc_wdt_stop(&pdc_wdt->wdt_dev); -- 2.2.0.rc0.207.ga3a616c
| |