All of lore.kernel.org
 help / color / mirror / Atom feed
* [v1,1/1] watchdog: (nct7904) Fix enable watchdog incorrectly
@ 2020-05-13 11:00 yuechao.zhao
  2020-05-13 13:16 ` Guenter Roeck
  0 siblings, 1 reply; 3+ messages in thread
From: yuechao.zhao @ 2020-05-13 11:00 UTC (permalink / raw)
  To: 345351830
  Cc: amy.shih, oakley.ding, jia.sui, Yuechao Zhao, Jean Delvare,
	Guenter Roeck, linux-hwmon, linux-kernel

From: Yuechao Zhao <yuechao.zhao@advantech.com.cn>

Use incorrect register to enable watchdog in nct7904_wdt_ping()

Signed-off-by: Yuechao Zhao <yuechao.zhao@advantech.com.cn>
---
 drivers/hwmon/nct7904.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c
index 04f2a8e..18c95be 100644
--- a/drivers/hwmon/nct7904.c
+++ b/drivers/hwmon/nct7904.c
@@ -979,7 +979,7 @@ static int nct7904_wdt_ping(struct watchdog_device *wdt)
 		return ret;
 
 	/* Enable soft watchdog timer */
-	return nct7904_write_reg(data, BANK_0, WDT_TIMER_REG, WDT_SOFT_EN);
+	return nct7904_write_reg(data, BANK_0, WDT_LOCK_REG, WDT_SOFT_EN);
 }
 
 static unsigned int nct7904_wdt_get_timeleft(struct watchdog_device *wdt)
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [v1,1/1] watchdog: (nct7904) Fix enable watchdog incorrectly
  2020-05-13 11:00 [v1,1/1] watchdog: (nct7904) Fix enable watchdog incorrectly yuechao.zhao
@ 2020-05-13 13:16 ` Guenter Roeck
  0 siblings, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2020-05-13 13:16 UTC (permalink / raw)
  To: yuechao.zhao, 345351830
  Cc: amy.shih, oakley.ding, jia.sui, Jean Delvare, linux-hwmon, linux-kernel

On 5/13/20 4:00 AM, yuechao.zhao@advantech.com.cn wrote:
> From: Yuechao Zhao <yuechao.zhao@advantech.com.cn>
> 
> Use incorrect register to enable watchdog in nct7904_wdt_ping()
> 

I assume you mean 'correct'.

Guenter

> Signed-off-by: Yuechao Zhao <yuechao.zhao@advantech.com.cn>
> ---
>  drivers/hwmon/nct7904.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c
> index 04f2a8e..18c95be 100644
> --- a/drivers/hwmon/nct7904.c
> +++ b/drivers/hwmon/nct7904.c
> @@ -979,7 +979,7 @@ static int nct7904_wdt_ping(struct watchdog_device *wdt)
>  		return ret;
>  
>  	/* Enable soft watchdog timer */
> -	return nct7904_write_reg(data, BANK_0, WDT_TIMER_REG, WDT_SOFT_EN);
> +	return nct7904_write_reg(data, BANK_0, WDT_LOCK_REG, WDT_SOFT_EN);
>  }
>  
>  static unsigned int nct7904_wdt_get_timeleft(struct watchdog_device *wdt)
> 


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [v1,1/1] watchdog: (nct7904) Fix enable watchdog incorrectly
@ 2020-05-13 15:24 Guenter Roeck
  0 siblings, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2020-05-13 15:24 UTC (permalink / raw)
  To: yuechao.zhao
  Cc: 345351830, amy.shih, oakley.ding, jia.sui, Jean Delvare,
	linux-hwmon, linux-kernel

On Wed, May 13, 2020 at 11:00:15AM +0000, yuechao.zhao@advantech.com.cn wrote:
> From: Yuechao Zhao <yuechao.zhao@advantech.com.cn>
> 
> Use incorrect register to enable watchdog in nct7904_wdt_ping()
> 
> Signed-off-by: Yuechao Zhao <yuechao.zhao@advantech.com.cn>

I merged this patch into the patch introducing watchdog support.

Thanks,
Guenter

> ---
>  drivers/hwmon/nct7904.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c
> index 04f2a8e..18c95be 100644
> --- a/drivers/hwmon/nct7904.c
> +++ b/drivers/hwmon/nct7904.c
> @@ -979,7 +979,7 @@ static int nct7904_wdt_ping(struct watchdog_device *wdt)
>  		return ret;
>  
>  	/* Enable soft watchdog timer */
> -	return nct7904_write_reg(data, BANK_0, WDT_TIMER_REG, WDT_SOFT_EN);
> +	return nct7904_write_reg(data, BANK_0, WDT_LOCK_REG, WDT_SOFT_EN);
>  }
>  
>  static unsigned int nct7904_wdt_get_timeleft(struct watchdog_device *wdt)
> -- 
> 1.8.3.1
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-05-13 15:24 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-13 11:00 [v1,1/1] watchdog: (nct7904) Fix enable watchdog incorrectly yuechao.zhao
2020-05-13 13:16 ` Guenter Roeck
2020-05-13 15:24 Guenter Roeck

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.