| Message ID | 20200604162602.76524-1-bruno.thomsen@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | rtc: pcf2127: watchdog: handle nowayout feature | expand |
On Thu, Jun 04, 2020 at 06:26:02PM +0200, Bruno Thomsen wrote: > Driver does not use module parameter for nowayout, so it need to > statically initialize status variable of the watchdog_device based > on CONFIG_WATCHDOG_NOWAYOUT. > > Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com> Acked-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/rtc/rtc-pcf2127.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c > index 4e50d6768f13..0f7d0a9a2d18 100644 > --- a/drivers/rtc/rtc-pcf2127.c > +++ b/drivers/rtc/rtc-pcf2127.c > @@ -441,6 +441,7 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap, > pcf2127->wdd.max_timeout = PCF2127_WD_VAL_MAX; > pcf2127->wdd.timeout = PCF2127_WD_VAL_DEFAULT; > pcf2127->wdd.min_hw_heartbeat_ms = 500; > + pcf2127->wdd.status = WATCHDOG_NOWAYOUT_INIT_STATUS; > > watchdog_set_drvdata(&pcf2127->wdd, pcf2127); > > -- > 2.26.2 >
On Thu, 4 Jun 2020 18:26:02 +0200, Bruno Thomsen wrote: > Driver does not use module parameter for nowayout, so it need to > statically initialize status variable of the watchdog_device based > on CONFIG_WATCHDOG_NOWAYOUT. Applied, thanks! [1/1] rtc: pcf2127: watchdog: handle nowayout feature commit: 4601e24a6fb819d38d1156d0f690cbe6a42c6d76 Best regards,
diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c index 4e50d6768f13..0f7d0a9a2d18 100644 --- a/drivers/rtc/rtc-pcf2127.c +++ b/drivers/rtc/rtc-pcf2127.c @@ -441,6 +441,7 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap, pcf2127->wdd.max_timeout = PCF2127_WD_VAL_MAX; pcf2127->wdd.timeout = PCF2127_WD_VAL_DEFAULT; pcf2127->wdd.min_hw_heartbeat_ms = 500; + pcf2127->wdd.status = WATCHDOG_NOWAYOUT_INIT_STATUS; watchdog_set_drvdata(&pcf2127->wdd, pcf2127);
Driver does not use module parameter for nowayout, so it need to statically initialize status variable of the watchdog_device based on CONFIG_WATCHDOG_NOWAYOUT. Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com> --- drivers/rtc/rtc-pcf2127.c | 1 + 1 file changed, 1 insertion(+)