summaryrefslogtreecommitdiffstats
path: root/lib/seq_buf.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2015-03-20 11:43:59 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-03-20 11:44:34 +0100
commit0f9e9cd61f46c07246e30871fd638ffeaca3c576 (patch)
tree1a7b84871da0f2ebad48c6838f66fbe91cc26995 /lib/seq_buf.c
parentdrm/i915: Update DRIVER_DATE to 20150313 (diff)
parentdrm/i915: Make sure the primary plane is enabled before reading out the fb state (diff)
downloadlinux-0f9e9cd61f46c07246e30871fd638ffeaca3c576.tar.xz
linux-0f9e9cd61f46c07246e30871fd638ffeaca3c576.zip
Merge tag 'drm-intel-fixes-2015-03-19' into drm-intel-next
Backmerge because of numerous and interleaving conflicts and git rerere getting confused a bit too often. Conflicts: drivers/gpu/drm/i915/intel_display.c All conflicts are because of -next patches backported to -fixes, so just go with the code in -next. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'lib/seq_buf.c')
-rw-r--r--lib/seq_buf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/seq_buf.c b/lib/seq_buf.c
index 88c0854bd752..5c94e1012a91 100644
--- a/lib/seq_buf.c
+++ b/lib/seq_buf.c
@@ -61,7 +61,7 @@ int seq_buf_vprintf(struct seq_buf *s, const char *fmt, va_list args)
if (s->len < s->size) {
len = vsnprintf(s->buffer + s->len, s->size - s->len, fmt, args);
- if (seq_buf_can_fit(s, len)) {
+ if (s->len + len < s->size) {
s->len += len;
return 0;
}
@@ -118,7 +118,7 @@ int seq_buf_bprintf(struct seq_buf *s, const char *fmt, const u32 *binary)
if (s->len < s->size) {
ret = bstr_printf(s->buffer + s->len, len, fmt, binary);
- if (seq_buf_can_fit(s, ret)) {
+ if (s->len + ret < s->size) {
s->len += ret;
return 0;
}