lkml.org 
[lkml]   [2018]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 3/4] watchdog: gpio: 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/gpio_wdt.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c
> index cb66c2f99ff1..d0e8203f7a60 100644
> --- a/drivers/watchdog/gpio_wdt.c
> +++ b/drivers/watchdog/gpio_wdt.c
> @@ -156,9 +156,9 @@ static int gpio_wdt_probe(struct platform_device *pdev)
> priv->wdd.min_timeout = SOFT_TIMEOUT_MIN;
> priv->wdd.max_hw_heartbeat_ms = hw_margin;
> priv->wdd.parent = &pdev->dev;
> + priv->wdd.timeout = SOFT_TIMEOUT_DEF;
>
> - if (watchdog_init_timeout(&priv->wdd, 0, &pdev->dev) < 0)
> - priv->wdd.timeout = SOFT_TIMEOUT_DEF;
> + watchdog_init_timeout(&priv->wdd, 0, &pdev->dev);
>
> watchdog_stop_on_reboot(&priv->wdd);
>
>

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