diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /drivers/gpu/drm/i915/i915_gpu_error.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gpu_error.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gpu_error.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index aba9d7498996..dae364f0028c 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c | |||
| @@ -143,8 +143,10 @@ static void i915_error_vprintf(struct drm_i915_error_state_buf *e, | |||
| 143 | 143 | ||
| 144 | /* Seek the first printf which is hits start position */ | 144 | /* Seek the first printf which is hits start position */ |
| 145 | if (e->pos < e->start) { | 145 | if (e->pos < e->start) { |
| 146 | len = vsnprintf(NULL, 0, f, args); | 146 | va_list tmp; |
| 147 | if (!__i915_error_seek(e, len)) | 147 | |
| 148 | va_copy(tmp, args); | ||
| 149 | if (!__i915_error_seek(e, vsnprintf(NULL, 0, f, tmp))) | ||
| 148 | return; | 150 | return; |
| 149 | } | 151 | } |
| 150 | 152 | ||