diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-02-01 07:22:47 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-02-01 07:22:47 +0100 |
| commit | 8058e14259ddc8c1824387198fc53700ed4cccc9 (patch) | |
| tree | faffb83ca5173e5f3cbfd4170de603ada4812e23 /drivers/gpu/drm/ttm/ttm_bo.c | |
| parent | 9ddf1aeb2134e72275c97a2c6ff2e3eb04f2f27a (diff) | |
| parent | 7da58046482fceb17c4a0d4afefd9507ec56de7f (diff) | |
Merge branch 'usb-audio-fix' of git://git.alsa-project.org/alsa-kprivate into for-linus
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_bo.c')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 33d20be87db5..52b20b12c83a 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -434,6 +434,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, bo->mem = tmp_mem; bdev->driver->move_notify(bo, mem); bo->mem = *mem; + *mem = tmp_mem; } goto out_err; |