diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-19 14:22:34 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-19 14:22:34 -0400 |
| commit | 2972bf78c18e5084a90980cbba106f53a09427ab (patch) | |
| tree | e5c539f48d5e90132a8eb44c6ff04c324eac285e /drivers/gpu/drm/ttm/ttm_bo_util.c | |
| parent | ed569f46a07bb2089138292df8faa8e3d583b577 (diff) | |
| parent | e4fcd69c9e4e273352e0f87cabd9648606da0c3e (diff) | |
Merge commit 'v3.1-rc10-9-ge4fcd69' into linaro-3.1linux-linaro-3.1-2011.10-0
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_bo_util.c')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index ae3c6f5dd2b..082fcaea583 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -321,7 +321,7 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, struct ttm_mem_type_manager *man = &bdev->man[new_mem->mem_type]; struct ttm_tt *ttm = bo->ttm; struct ttm_mem_reg *old_mem = &bo->mem; - struct ttm_mem_reg old_copy; + struct ttm_mem_reg old_copy = *old_mem; void *old_iomap; void *new_iomap; int ret; |