From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 19 Feb 2007 22:16:51 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: firefly_0821_release~31094
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2aa6eb313e57a8254b17e60b8bb5e0a2570d7776;hp=cb553c480078759014096bc766dc76400e1d8397;p=firefly-linux-kernel-4.4.55.git

Merge /linux/kernel/git/wim/linux-2.6-watchdog

* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] machzwd warning fix
---

diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c
index 81fb3dec180f..4a328ba0d262 100644
--- a/drivers/char/watchdog/machzwd.c
+++ b/drivers/char/watchdog/machzwd.c
@@ -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: