Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e73a7802 authored by Wim Van Sebroeck's avatar Wim Van Sebroeck
Browse files

[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: default avatarWim Van Sebroeck <wim@iguana.be>
parent b6bf291f

drivers/watchdog/ar7_wdt.c

+2 −1
Original line number Diff line number Diff line
@@ -246,7 +246,8 @@ static long ar7_wdt_ioctl(struct file *file, 
	static struct watchdog_info ident = {

		.identity = LONGNAME,

		.firmware_version = 1,

		.options = (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING),

		.options = (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |

						WDIOF_MAGICCLOSE),

	};

	int new_margin;

drivers/watchdog/at91sam9_wdt.c

+2 −1
Original line number Diff line number Diff line
@@ -156,7 +156,8 @@ static int at91_wdt_settimeout(unsigned int timeout) 


static const struct watchdog_info at91_wdt_info = {

	.identity	= DRV_NAME,

	.options	= WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,

	.options	= WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |

						WDIOF_MAGICCLOSE,

};



/*

drivers/watchdog/indydog.c

+1 −3
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ static int indydog_open(struct inode *inode, struct file *file) 
	indydog_start();

	indydog_ping();



	indydog_alive = 1;

	printk(KERN_INFO "Started watchdog timer.\n");



	return nonseekable_open(inode, file);
@@ -113,8 +112,7 @@ static long indydog_ioctl(struct file *file, unsigned int cmd, 
{

	int options, retval = -EINVAL;

	static struct watchdog_info ident = {

		.options		= WDIOF_KEEPALIVEPING |

					  WDIOF_MAGICCLOSE,

		.options		= WDIOF_KEEPALIVEPING,

		.firmware_version	= 0,

		.identity		= "Hardware Watchdog for SGI IP22",

	};

drivers/watchdog/it8712f_wdt.c

+2 −1
Original line number Diff line number Diff line
@@ -239,7 +239,8 @@ static long it8712f_wdt_ioctl(struct file *file, unsigned int cmd, 
	static struct watchdog_info ident = {

		.identity = "IT8712F Watchdog",

		.firmware_version = 1,

		.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,

		.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |

						WDIOF_MAGICCLOSE,

	};

	int value;

drivers/watchdog/sb_wdog.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static int expect_close; 


static const struct watchdog_info ident = {

	.options	= WDIOF_CARDRESET | WDIOF_SETTIMEOUT |

						WDIOF_KEEPALIVEPING,

					WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,

	.identity	= "SiByte Watchdog",

};