Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for...

[platform/kernel/linux-rpi.git] / arch / um / drivers / harddog_user.c

diff --git a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c
index 448ba59..b56f8e0 100644 (file)
--- 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, 1, NULL);
+               helper_wait(pid);
                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, 1, NULL);
+               helper_wait(pid);
                err = n;
                goto out_close_out;
        }