summaryrefslogtreecommitdiff
path: root/components/drivers/src/ringbuffer.c
diff options
context:
space:
mode:
authorheyuanjie <[email protected]>2018-05-02 09:47:57 +0800
committerheyuanjie <[email protected]>2018-05-02 09:47:57 +0800
commit313920126ba1bfaa7fb833860536c03f78f436fb (patch)
tree54b011f26104ae478323cc33709e9f9622023662 /components/drivers/src/ringbuffer.c
parentaa86f7f7bb78443780a71486a66c2f339243484f (diff)
parent795f9873ccd1fc71497d5c2d96fb870ea17fe67b (diff)
Merge branch 'master' of https://github.com/RT-Thread/rt-thread into imx1050
Diffstat (limited to 'components/drivers/src/ringbuffer.c')
-rw-r--r--components/drivers/src/ringbuffer.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/components/drivers/src/ringbuffer.c b/components/drivers/src/ringbuffer.c
index baeeea0e50..48bf590f8c 100644
--- a/components/drivers/src/ringbuffer.c
+++ b/components/drivers/src/ringbuffer.c
@@ -119,8 +119,11 @@ rt_size_t rt_ringbuffer_put_force(struct rt_ringbuffer *rb,
space_length = rt_ringbuffer_space_len(rb);
- if (length > space_length)
+ if (length > rb->buffer_size)
+ {
+ ptr = &ptr[length - rb->buffer_size];
length = rb->buffer_size;
+ }
if (rb->buffer_size - rb->write_index > length)
{