linux-kernel - Re: [PATCH] watchdog: sunxi: fix activation of system reset

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: <559AE3FE.7090202@roeck-us.net>
Date:	Mon, 06 Jul 2015 13:24:30 -0700
From:	Guenter Roeck <linux@...ck-us.net>
To:	Francesco Lavra <francescolavra.fl@...il.com>, wim@...ana.be,
	maxime.ripard@...e-electrons.com, linux-watchdog@...r.kernel.org,
	linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] watchdog: sunxi: fix activation of system reset

On 07/06/2015 10:59 AM, Francesco Lavra wrote:
> Commit f2147de3 ("watchdog: sunxi: support parameterized compatible
> strings") introduced a regression in sunxi_wdt_start(), by which
> the system reset function of the watchdog is not enabled upon
> starting the watchdog. Fix it.
>
> Signed-off-by: Francesco Lavra <francescolavra.fl@...il.com>

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

> ---
>   drivers/watchdog/sunxi_wdt.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c
> index a29afb3..47bd8a1 100644
> --- a/drivers/watchdog/sunxi_wdt.c
> +++ b/drivers/watchdog/sunxi_wdt.c
> @@ -184,7 +184,7 @@ static int sunxi_wdt_start(struct watchdog_device *wdt_dev)
>   	/* Set system reset function */
>   	reg = readl(wdt_base + regs->wdt_cfg);
>   	reg &= ~(regs->wdt_reset_mask);
> -	reg |= ~(regs->wdt_reset_val);
> +	reg |= regs->wdt_reset_val;
>   	writel(reg, wdt_base + regs->wdt_cfg);
>
>   	/* Enable watchdog */
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/