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

Commit bad77057 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] machzwd warning fix



drivers/char/watchdog/machzwd.c: In function 'zf_ioctl':
drivers/char/watchdog/machzwd.c:327: warning: passing argument 1 of 'zf_ping' makes integer from pointer without a cast

Also some coding-style repairs.

Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@ftp.linux.org.uk>
Acked-by: default avatarWim Van Sebroeck <wim@iguana.be>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6a3d0390
Loading
Loading
Loading
Loading
+12 −12
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static int zf_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
		return put_user(0, p);

	case WDIOC_KEEPALIVE:
			zf_ping(NULL);
		zf_ping(0);
		break;

	default: