Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 86224
b: refs/heads/master
c: e4d06b3
h: refs/heads/master
v: v3
  • Loading branch information
Johann Felix Soden authored and Linus Torvalds committed Feb 24, 2008
1 parent e063001 commit 9973dfa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b32eb52e4093351bd0debd027575578a599bfb3e
refs/heads/master: e4d06b3f904ddfab4531a1e23f1f5e1bd284b605
4 changes: 2 additions & 2 deletions trunk/arch/um/drivers/harddog_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 9973dfa

Please sign in to comment.