diff --git a/include/common/buffer.h b/include/common/buffer.h
index d46495c88..18ced917b 100644
--- a/include/common/buffer.h
+++ b/include/common/buffer.h
@@ -272,8 +272,8 @@ static inline const char *buffer_pointer(const struct buffer *buf, const char *p
 static inline int buffer_count(const struct buffer *buf, const char *from, const char *to)
 {
 	int count = to - from;
-	if (count < 0)
-		count += buf->size;
+
+	count += count < 0 ? buf->size : 0;
 	return count;
 }