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

Commit 266aa1c4 authored by Wim Van Sebroeck's avatar Wim Van Sebroeck
Browse files

[WATCHDOG] driver-for-ibm-automatic-server-restart-watchdog-fix2.patch 



The device/watchdog has a fixed timeout/heartbeat.
So we don't support the WDIOC_SETTIMEOUT ioctl call
and we also may not set the WDIOF_SETTIMEOUT flag.

Cc: Andrey Panin <pazke@donpac.ru>
Cc: Andrew Morton <akpm@osdl.org>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent cd7b8007

drivers/char/watchdog/ibmasr.c

+3 −8
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static int asr_ioctl(struct inode *inode, struct file *file, 
		     unsigned int cmd, unsigned long arg)

{

	static const struct watchdog_info ident = {

		.options =	WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT |

		.options =	WDIOF_KEEPALIVEPING | 

				WDIOF_MAGICCLOSE,

		.identity =	"IBM ASR"

	};
@@ -268,14 +268,9 @@ static int asr_ioctl(struct inode *inode, struct file *file, 
			return 0;



		/*

		 * The hardware has a fixed timeout value, so WDIOC_SETTIMEOUT

		 * is a noop and WDIOC_GETTIMEOUT always returns 256.

		 * The hardware has a fixed timeout value, so no WDIOC_SETTIMEOUT

		 * and WDIOC_GETTIMEOUT always returns 256.

		 */

		case WDIOC_SETTIMEOUT:

			if (get_user(heartbeat, p))

				return -EFAULT;

			/* Fall */



		case WDIOC_GETTIMEOUT:

			heartbeat = 256;

			return put_user(heartbeat, p);