From fbc80e2564f8e20ab4b2e38df527f5af25bb87dd Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 23 Dec 2007 20:01:04 +0000 Subject: [PATCH] --- yaml --- r: 75159 b: refs/heads/master c: c63f702068a445f682d7590c5fadfc266785a071 h: refs/heads/master i: 75157: c79800f774f9ffa23efc729205a42d4bcca2b9b9 75155: 2dc82742aae304632590080d030f38707e9f8626 75151: cb41e44b1c1a626ec57d6da9545710367d88fbfe v: v3 --- [refs] | 2 +- trunk/arch/um/drivers/harddog_user.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 889b175eff60..bd4192ea678d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db99247ac68fc352100090ad7704fb5efb9327b6 +refs/heads/master: c63f702068a445f682d7590c5fadfc266785a071 diff --git a/trunk/arch/um/drivers/harddog_user.c b/trunk/arch/um/drivers/harddog_user.c index b56f8e0196a9..448ba59207a1 100644 --- a/trunk/arch/um/drivers/harddog_user.c +++ b/trunk/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; }