diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-27 09:13:38 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-27 09:13:38 +0900 |
| commit | cf516d08eceb4c442f0f2f1a73ebf994b1dbf0ed (patch) | |
| tree | a56d5024a453bb323039f7c481ac17738269e24f /drivers/gpu/drm/qxl/qxl_release.c | |
| parent | 047e6646579c2853afba0111f573796daf4fd485 (diff) | |
| parent | 32b88194f71d6ae7768a29f87fbba454728273ee (diff) | |
| download | talos-op-linux-cf516d08eceb4c442f0f2f1a73ebf994b1dbf0ed.tar.gz talos-op-linux-cf516d08eceb4c442f0f2f1a73ebf994b1dbf0ed.zip | |
Merge 4.3-rc7 into staging-next
We want the other staging patches in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/qxl/qxl_release.c')
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_release.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c index b66ec331c17c..4efa8e261baf 100644 --- a/drivers/gpu/drm/qxl/qxl_release.c +++ b/drivers/gpu/drm/qxl/qxl_release.c @@ -307,7 +307,7 @@ int qxl_alloc_surface_release_reserved(struct qxl_device *qdev, idr_ret = qxl_release_alloc(qdev, QXL_RELEASE_SURFACE_CMD, release); if (idr_ret < 0) return idr_ret; - bo = qxl_bo_ref(to_qxl_bo(entry->tv.bo)); + bo = to_qxl_bo(entry->tv.bo); (*release)->release_offset = create_rel->release_offset + 64; @@ -316,8 +316,6 @@ int qxl_alloc_surface_release_reserved(struct qxl_device *qdev, info = qxl_release_map(qdev, *release); info->id = idr_ret; qxl_release_unmap(qdev, *release, info); - - qxl_bo_unref(&bo); return 0; } |
