---

yaml --- r: 75159 b: refs/heads/master c: c63f702 h: refs/heads/master i: 75157: c79800f 75155: 2dc8274 75151: cb41e44 v: v3
git-mirror · Dec 23, 2007 · fbc80e2 · fbc80e2
1 parent fc77b2e
commit fbc80e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;
 	}