diff --git a/[refs] b/[refs] index 20a676c2ac65..a20960c552b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dedf8b79ec06e91fa87f6cba99e6e61b4140ceca +refs/heads/master: 1bfbc608ba05951678eedc246c9baf62367764a0 diff --git a/trunk/kernel/relay.c b/trunk/kernel/relay.c index ad855017bc59..61134eb7a0c8 100644 --- a/trunk/kernel/relay.c +++ b/trunk/kernel/relay.c @@ -370,7 +370,7 @@ void relay_reset(struct rchan *chan) if (!chan) return; - if (chan->is_global && chan->buf[0]) { + if (chan->is_global && chan->buf[0]) { __relay_reset(chan->buf[0], 0); return; } @@ -850,13 +850,13 @@ static int relay_file_read_avail(struct rchan_buf *buf, size_t read_pos) buf->subbufs_consumed = consumed; buf->bytes_consumed = 0; } - + produced = (produced % n_subbufs) * subbuf_size + buf->offset; consumed = (consumed % n_subbufs) * subbuf_size + buf->bytes_consumed; if (consumed > produced) produced += n_subbufs * subbuf_size; - + if (consumed == produced) return 0;