diff options
| author | Al Viro | 2007-12-23 21:01:04 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2007-12-23 21:54:37 +0100 |
| commit | c63f702068a445f682d7590c5fadfc266785a071 (patch) | |
| tree | 887304c2366f3cb68c408cecc72045fba6a88f47 /arch/um/drivers | |
| parent | tty: fix logic change introduced by wait_event_interruptible_timeout() (diff) | |
| download | kernel-qcow2-linux-c63f702068a445f682d7590c5fadfc266785a071.tar.gz kernel-qcow2-linux-c63f702068a445f682d7590c5fadfc266785a071.tar.xz kernel-qcow2-linux-c63f702068a445f682d7590c5fadfc266785a071.zip | |
uml: user of helper_wait() got missed when it got extra arguments
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/drivers')
| -rw-r--r-- | arch/um/drivers/harddog_user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c index b56f8e0196a9..448ba59207a1 100644 --- a/arch/um/drivers/harddog_user.c +++ b/arch/um/drivers/harddog_user.c @@ -79,14 +79,14 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock) n = read(in_fds[0], &c, sizeof(c)); if (n == 0) { printk("harddog_open - EOF on watchdog pipe\n"); - helper_wait(pid); + helper_wait(pid, 1, NULL); err = -EIO; goto out_close_out; } else if (n < 0) { printk("harddog_open - read of watchdog pipe failed, " "err = %d\n", errno); - helper_wait(pid); + helper_wait(pid, 1, NULL); err = n; goto out_close_out; } |