From 9973dfa62b184ec6a55d4f6681322e5b18ef4c44 Mon Sep 17 00:00:00 2001 From: Johann Felix Soden Date: Sat, 23 Feb 2008 15:23:49 -0800 Subject: [PATCH] --- yaml --- r: 86224 b: refs/heads/master c: e4d06b3f904ddfab4531a1e23f1f5e1bd284b605 h: refs/heads/master 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 3fe56d0e92bc..b9952b985138 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b32eb52e4093351bd0debd027575578a599bfb3e +refs/heads/master: e4d06b3f904ddfab4531a1e23f1f5e1bd284b605 diff --git a/trunk/arch/um/drivers/harddog_user.c b/trunk/arch/um/drivers/harddog_user.c index 448ba59207a1..b56f8e0196a9 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, 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; }