git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.14-rc6' into drm-intel-next-queued
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_gpu_error.c
diff --git
a/drivers/gpu/drm/i915/i915_gpu_error.c
b/drivers/gpu/drm/i915/i915_gpu_error.c
index
ce2dd60
..
144a5e2
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/
drivers/gpu/drm/i915/i915_gpu_error.c
@@
-146,7
+146,10
@@
static void i915_error_vprintf(struct drm_i915_error_state_buf *e,
va_list tmp;
va_copy(tmp, args);
- if (!__i915_error_seek(e, vsnprintf(NULL, 0, f, tmp)))
+ len = vsnprintf(NULL, 0, f, tmp);
+ va_end(tmp);
+
+ if (!__i915_error_seek(e, len))
return;
}