mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
Merge master.kernel.org:/pub/scm/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
This commit is contained in:
commit
2aa6eb313e
1 changed files with 1 additions and 1 deletions
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue