linux-kernel - Re: [PATCH 2/4] watchdog: omap_wdt: change order for setting default timeout

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1e30bcff-801e-7b1f-2e1c-2645e9171826@roeck-us.net>
Date:   Sat, 10 Feb 2018 19:54:47 -0800
From:   Guenter Roeck <linux@...ck-us.net>
To:     Marcus Folkesson <marcus.folkesson@...il.com>,
        Wim Van Sebroeck <wim@...ana.be>
Cc:     linux-watchdog@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 2/4] watchdog: omap_wdt: change order for setting default
 timeout

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@...il.com>

Reviewed-by: Guenter Roeck <linux@...ck-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);
>   
>