diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 17:16:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 17:16:51 -0500 |
| commit | 2aa6eb313e57a8254b17e60b8bb5e0a2570d7776 (patch) | |
| tree | 0e775fe39ef50f873264e2bd444da78a95f08684 /drivers | |
| parent | cb553c480078759014096bc766dc76400e1d8397 (diff) | |
| parent | 420cff550fb1338bc946f1ccc8bb66f2d96ad1cb (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/watchdog/machzwd.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, | |||
| 324 | return put_user(0, p); | 324 | return put_user(0, p); |
| 325 | 325 | ||
| 326 | case WDIOC_KEEPALIVE: | 326 | case WDIOC_KEEPALIVE: |
| 327 | zf_ping(NULL); | 327 | zf_ping(0); |
| 328 | break; | 328 | break; |
| 329 | 329 | ||
| 330 | default: | 330 | default: |