diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2007-12-23 15:01:04 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-23 15:54:37 -0500 |
| commit | c63f702068a445f682d7590c5fadfc266785a071 (patch) | |
| tree | 887304c2366f3cb68c408cecc72045fba6a88f47 /arch/um | |
| parent | db99247ac68fc352100090ad7704fb5efb9327b6 (diff) | |
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')
| -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) | |||
| 79 | n = read(in_fds[0], &c, sizeof(c)); | 79 | n = read(in_fds[0], &c, sizeof(c)); |
| 80 | if (n == 0) { | 80 | if (n == 0) { |
| 81 | printk("harddog_open - EOF on watchdog pipe\n"); | 81 | printk("harddog_open - EOF on watchdog pipe\n"); |
| 82 | helper_wait(pid); | 82 | helper_wait(pid, 1, NULL); |
| 83 | err = -EIO; | 83 | err = -EIO; |
| 84 | goto out_close_out; | 84 | goto out_close_out; |
| 85 | } | 85 | } |
| 86 | else if (n < 0) { | 86 | else if (n < 0) { |
| 87 | printk("harddog_open - read of watchdog pipe failed, " | 87 | printk("harddog_open - read of watchdog pipe failed, " |
| 88 | "err = %d\n", errno); | 88 | "err = %d\n", errno); |
| 89 | helper_wait(pid); | 89 | helper_wait(pid, 1, NULL); |
| 90 | err = n; | 90 | err = n; |
| 91 | goto out_close_out; | 91 | goto out_close_out; |
| 92 | } | 92 | } |