2017-07-20 02:46:56

by yjin

Subject: [PATCH] watchdog: imx2_wdt: use new_timeout value to override the old

From: Yanjiang Jin <[email protected]>

Without this patch we couldn't change the timeout value of imx2_wdt.

Signed-off-by: Yanjiang Jin <[email protected]>
---
drivers/watchdog/imx2_wdt.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index 4874b0f..6cfeee6 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -178,6 +178,9 @@ static int imx2_wdt_set_timeout(struct watchdog_device *wdog,

regmap_update_bits(wdev->regmap, IMX2_WDT_WCR, IMX2_WDT_WCR_WT,
WDOG_SEC_TO_COUNT(new_timeout));
+
+ wdog->timeout = new_timeout;
+
return 0;
}

--
1.9.1

2017-07-20 03:18:29

by Guenter Roeck

Subject: Re: [PATCH] watchdog: imx2_wdt: use new_timeout value to override the old

On 07/19/2017 07:45 PM, [email protected] wrote:
> From: Yanjiang Jin <[email protected]>
>
> Without this patch we couldn't change the timeout value of imx2_wdt.
>
> Signed-off-by: Yanjiang Jin <[email protected]>
> ---
> drivers/watchdog/imx2_wdt.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
> index 4874b0f..6cfeee6 100644
> --- a/drivers/watchdog/imx2_wdt.c
> +++ b/drivers/watchdog/imx2_wdt.c
> @@ -178,6 +178,9 @@ static int imx2_wdt_set_timeout(struct watchdog_device *wdog,
>
> regmap_update_bits(wdev->regmap, IMX2_WDT_WCR, IMX2_WDT_WCR_WT,
> WDOG_SEC_TO_COUNT(new_timeout));
> +
> + wdog->timeout = new_timeout;
> +

I must be missing something. That very same code is already in line 177,
added with commit 30dd4a8f08b57 ("watchdog: imx2_wdt: also set wdog->timeout
to new_timeout") back in 2015.

Did you see this in an older kernel, maybe ?

Guenter

2017-07-20 03:22:41

by yjin

Subject: Re: [PATCH] watchdog: imx2_wdt: use new_timeout value to override the old

On 2017年07月20日 11:18, Guenter Roeck wrote:
> On 07/19/2017 07:45 PM, [email protected] wrote:
>> From: Yanjiang Jin <[email protected]>
>>
>> Without this patch we couldn't change the timeout value of imx2_wdt.
>>
>> Signed-off-by: Yanjiang Jin <[email protected]>
>> ---
>> drivers/watchdog/imx2_wdt.c | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
>> index 4874b0f..6cfeee6 100644
>> --- a/drivers/watchdog/imx2_wdt.c
>> +++ b/drivers/watchdog/imx2_wdt.c
>> @@ -178,6 +178,9 @@ static int imx2_wdt_set_timeout(struct
>> watchdog_device *wdog,
>> regmap_update_bits(wdev->regmap, IMX2_WDT_WCR, IMX2_WDT_WCR_WT,
>> WDOG_SEC_TO_COUNT(new_timeout));
>> +
>> + wdog->timeout = new_timeout;
>> +
>
> I must be missing something. That very same code is already in line 177,
> added with commit 30dd4a8f08b57 ("watchdog: imx2_wdt: also set
> wdog->timeout
> to new_timeout") back in 2015.
>
> Did you see this in an older kernel, maybe ?

Oh, I missed this. I did use the older kernel to validate it. Thanks for
your reminder, please ignore my patch.
Thanks again!

Regards!
Yanjiang
>
> Guenter