aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lepore <ian@FreeBSD.org>2015-08-07 21:14:19 +0000
committerIan Lepore <ian@FreeBSD.org>2015-08-07 21:14:19 +0000
commit6f7a9f7c8dd36911b3aa607142652a7fb952c79d (patch)
treebbc2f2a83d28b793f43cd3629b34367a3faad192
parent7e518a6648cd25343982e9ae18cf638ca8712d49 (diff)
Notes
-rw-r--r--sys/kern/kern_tc.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index e99781841f94..922e9bf64fc7 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -1541,8 +1541,12 @@ pps_fetch(struct pps_fetch_args *fapi, struct pps_state *pps)
} else {
err = tsleep(pps, PCATCH, "ppsfch", timo);
}
- if (err == EWOULDBLOCK && fapi->timeout.tv_sec == -1) {
- continue;
+ if (err == EWOULDBLOCK) {
+ if (fapi->timeout.tv_sec == -1) {
+ continue;
+ } else {
+ return (ETIMEDOUT);
+ }
} else if (err != 0) {
return (err);
}