]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
uml: user of helper_wait() got missed when it got extra arguments
authorAl Viro <viro@ftp.linux.org.uk>
Sun, 23 Dec 2007 20:01:04 +0000 (20:01 +0000)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 23 Dec 2007 20:54:37 +0000 (12:54 -0800)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/um/drivers/harddog_user.c

index b56f8e0196a9e1c4bc0d2c6aa3308785e4c750e9..448ba59207a13f0f65e67cef68fd0ccc3f7ebb7e 100644 (file)
@@ -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;
        }