diff options
Diffstat (limited to 'drivers/watchdog/sb_wdog.c')
| -rw-r--r-- | drivers/watchdog/sb_wdog.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c index 38f5831c9291..9748eed73196 100644 --- a/drivers/watchdog/sb_wdog.c +++ b/drivers/watchdog/sb_wdog.c | |||
| @@ -93,7 +93,7 @@ static int expect_close; | |||
| 93 | 93 | ||
| 94 | static const struct watchdog_info ident = { | 94 | static const struct watchdog_info ident = { |
| 95 | .options = WDIOF_CARDRESET | WDIOF_SETTIMEOUT | | 95 | .options = WDIOF_CARDRESET | WDIOF_SETTIMEOUT | |
| 96 | WDIOF_KEEPALIVEPING, | 96 | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, |
| 97 | .identity = "SiByte Watchdog", | 97 | .identity = "SiByte Watchdog", |
| 98 | }; | 98 | }; |
| 99 | 99 | ||
| @@ -269,9 +269,10 @@ irqreturn_t sbwdog_interrupt(int irq, void *addr) | |||
| 269 | * if it's the second watchdog timer, it's for those users | 269 | * if it's the second watchdog timer, it's for those users |
| 270 | */ | 270 | */ |
| 271 | if (wd_cfg_reg == user_dog) | 271 | if (wd_cfg_reg == user_dog) |
| 272 | printk(KERN_CRIT | 272 | printk(KERN_CRIT "%s in danger of initiating system reset " |
| 273 | "%s in danger of initiating system reset in %ld.%01ld seconds\n", | 273 | "in %ld.%01ld seconds\n", |
| 274 | ident.identity, wd_init / 1000000, (wd_init / 100000) % 10); | 274 | ident.identity, |
| 275 | wd_init / 1000000, (wd_init / 100000) % 10); | ||
| 275 | else | 276 | else |
| 276 | cfg |= 1; | 277 | cfg |= 1; |
| 277 | 278 | ||
