| Message ID | 20230418172531.177349-3-jth@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | watchdog: fixes for menz069_wdt driver | expand |
On 4/18/23 10:25, Johannes Thumshirn wrote: > When setting the timeout for the menz069_wdt watchdog driver, we > erroneously read from the 'watchdog value register' (WVR) instead of the > 'watchdog timer register' (WTR) and then write the value back into WTR. > > This can potentially lead to wrong timeouts and wrong enable bit settings. > > Signed-off-by: Johannes Thumshirn <jth@kernel.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/menz69_wdt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/watchdog/menz69_wdt.c b/drivers/watchdog/menz69_wdt.c > index bca0938f3429..3c98030b9fcd 100644 > --- a/drivers/watchdog/menz69_wdt.c > +++ b/drivers/watchdog/menz69_wdt.c > @@ -77,7 +77,7 @@ static int men_z069_wdt_set_timeout(struct watchdog_device *wdt, > wdt->timeout = timeout; > val = timeout * MEN_Z069_TIMER_FREQ; > > - reg = readw(drv->base + MEN_Z069_WVR); > + reg = readw(drv->base + MEN_Z069_WTR); > ena = reg & MEN_Z069_WTR_WDEN; > reg = ena | val; > writew(reg, drv->base + MEN_Z069_WTR);
diff --git a/drivers/watchdog/menz69_wdt.c b/drivers/watchdog/menz69_wdt.c index bca0938f3429..3c98030b9fcd 100644 --- a/drivers/watchdog/menz69_wdt.c +++ b/drivers/watchdog/menz69_wdt.c @@ -77,7 +77,7 @@ static int men_z069_wdt_set_timeout(struct watchdog_device *wdt, wdt->timeout = timeout; val = timeout * MEN_Z069_TIMER_FREQ; - reg = readw(drv->base + MEN_Z069_WVR); + reg = readw(drv->base + MEN_Z069_WTR); ena = reg & MEN_Z069_WTR_WDEN; reg = ena | val; writew(reg, drv->base + MEN_Z069_WTR);
When setting the timeout for the menz069_wdt watchdog driver, we erroneously read from the 'watchdog value register' (WVR) instead of the 'watchdog timer register' (WTR) and then write the value back into WTR. This can potentially lead to wrong timeouts and wrong enable bit settings. Signed-off-by: Johannes Thumshirn <jth@kernel.org> --- drivers/watchdog/menz69_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)