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

Commit 5c4eb61b authored Jul 21, 2007 by Wim Van Sebroeck

[WATCHDOG] WDIOC_GETSTATUS and WDIOC_GETBOOTSTATUS clean-up



Add mandatory WDIOC_GETSTATUS and WDIOC_GETBOOTSTATUS ioctl's for
drivers that don't have them yet.

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

parent ec9505a7

drivers/char/watchdog/cpu5wdt.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,10 @@ static int cpu5wdt_ioctl(struct inode inode, struct file file, unsigned int cm
		if ( copy_to_user(argp, &value, sizeof(int)) )
		return -EFAULT;
		break;
		case WDIOC_GETBOOTSTATUS:
		if ( copy_to_user(argp, &value, sizeof(int)) )
		retrun -EFAULT;
		break;
		case WDIOC_GETSUPPORT:
		if ( copy_to_user(argp, &ident, sizeof(ident)) )
		return -EFAULT;

drivers/char/watchdog/machzwd.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -321,6 +321,7 @@ static int zf_ioctl(struct inode inode, struct file file, unsigned int cmd,
		break;

		case WDIOC_GETSTATUS:
		case WDIOC_GETBOOTSTATUS:
		return put_user(0, p);

		case WDIOC_KEEPALIVE:

drivers/char/watchdog/mixcomwd.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -215,6 +215,11 @@ static int mixcomwd_ioctl(struct inode inode, struct file file,
		return -EFAULT;
		}
		break;
		case WDIOC_GETBOOTSTATUS:
		if (copy_to_user(p, &status, sizeof(int))) {
		return -EFAULT;
		}
		break;
		case WDIOC_GETSUPPORT:
		if (copy_to_user(argp, &ident, sizeof(ident))) {
		return -EFAULT;

drivers/char/watchdog/mpc83xx_wdt.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,9 @@ static int mpc83xx_wdt_ioctl(struct inode inode, struct file file,
		switch (cmd) {
		case WDIOC_GETSUPPORT:
		return copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
		case WDIOC_GETSTATUS:
		case WDIOC_GETBOOTSTATUS:
		return put_user(0, p);
		case WDIOC_KEEPALIVE:
		mpc83xx_wdt_keepalive();
		return 0;

drivers/char/watchdog/mtx-1_wdt.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -143,6 +143,7 @@ static int mtx1_wdt_ioctl(struct inode inode, struct file file, unsigned int c
		mtx1_wdt_reset();
		break;
		case WDIOC_GETSTATUS:
		case WDIOC_GETBOOTSTATUS:
		if ( copy_to_user(argp, &value, sizeof(int)) )
		return -EFAULT;
		break;