lkml.org 
[lkml]   [2018]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 2/4] watchdog: omap_wdt: change order for setting default timeout
From
Date
On 02/10/2018 12:36 PM, Marcus Folkesson wrote:
> watchdog_init_timeout() will preserve wdd->timeout value if
> no parameter nor timeout-secs dt property is set.
>
> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
> drivers/watchdog/omap_wdt.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
> index 1b02bfa81b29..ae77112ce97f 100644
> --- a/drivers/watchdog/omap_wdt.c
> +++ b/drivers/watchdog/omap_wdt.c
> @@ -253,10 +253,10 @@ static int omap_wdt_probe(struct platform_device *pdev)
> wdev->wdog.ops = &omap_wdt_ops;
> wdev->wdog.min_timeout = TIMER_MARGIN_MIN;
> wdev->wdog.max_timeout = TIMER_MARGIN_MAX;
> + wdev->wdog.timeout = TIMER_MARGIN_DEFAULT;
> wdev->wdog.parent = &pdev->dev;
>
> - if (watchdog_init_timeout(&wdev->wdog, timer_margin, &pdev->dev) < 0)
> - wdev->wdog.timeout = TIMER_MARGIN_DEFAULT;
> + watchdog_init_timeout(&wdev->wdog, timer_margin, &pdev->dev);
>
> watchdog_set_nowayout(&wdev->wdog, nowayout);
>
>

\
 
 \ /
  Last update: 2018-02-11 04:55    [W:0.064 / U:0.188 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site