Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[WATCHDOG] Correct WDIOF_MAGICCLOSE flag

Make sure that when the WDIOF_MAGICCLOSE flag is set we also
support the magic-close feature...

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

+11 -10
+2 -1
drivers/watchdog/ar7_wdt.c
··· 246 246 static struct watchdog_info ident = { 247 247 .identity = LONGNAME, 248 248 .firmware_version = 1, 249 - .options = (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING), 249 + .options = (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | 250 + WDIOF_MAGICCLOSE), 250 251 }; 251 252 int new_margin; 252 253
+2 -1
drivers/watchdog/at91sam9_wdt.c
··· 156 156 157 157 static const struct watchdog_info at91_wdt_info = { 158 158 .identity = DRV_NAME, 159 - .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, 159 + .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | 160 + WDIOF_MAGICCLOSE, 160 161 }; 161 162 162 163 /*
+1 -3
drivers/watchdog/indydog.c
··· 83 83 indydog_start(); 84 84 indydog_ping(); 85 85 86 - indydog_alive = 1; 87 86 printk(KERN_INFO "Started watchdog timer.\n"); 88 87 89 88 return nonseekable_open(inode, file); ··· 112 113 { 113 114 int options, retval = -EINVAL; 114 115 static struct watchdog_info ident = { 115 - .options = WDIOF_KEEPALIVEPING | 116 - WDIOF_MAGICCLOSE, 116 + .options = WDIOF_KEEPALIVEPING, 117 117 .firmware_version = 0, 118 118 .identity = "Hardware Watchdog for SGI IP22", 119 119 };
+2 -1
drivers/watchdog/it8712f_wdt.c
··· 239 239 static struct watchdog_info ident = { 240 240 .identity = "IT8712F Watchdog", 241 241 .firmware_version = 1, 242 - .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, 242 + .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | 243 + WDIOF_MAGICCLOSE, 243 244 }; 244 245 int value; 245 246
+1 -1
drivers/watchdog/sb_wdog.c
··· 93 93 94 94 static const struct watchdog_info ident = { 95 95 .options = WDIOF_CARDRESET | WDIOF_SETTIMEOUT | 96 - WDIOF_KEEPALIVEPING, 96 + WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, 97 97 .identity = "SiByte Watchdog", 98 98 }; 99 99
+1 -2
drivers/watchdog/sbc_epx_c3.c
··· 107 107 int options, retval = -EINVAL; 108 108 int __user *argp = (void __user *)arg; 109 109 static const struct watchdog_info ident = { 110 - .options = WDIOF_KEEPALIVEPING | 111 - WDIOF_MAGICCLOSE, 110 + .options = WDIOF_KEEPALIVEPING, 112 111 .firmware_version = 0, 113 112 .identity = "Winsystems EPX-C3 H/W Watchdog", 114 113 };
+2 -1
drivers/watchdog/scx200_wdt.c
··· 165 165 static const struct watchdog_info ident = { 166 166 .identity = "NatSemi SCx200 Watchdog", 167 167 .firmware_version = 1, 168 - .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, 168 + .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | 169 + WDIOF_MAGICCLOSE, 169 170 }; 170 171 int new_margin; 171 172