diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2015-11-09 13:29:39 -0500 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2015-11-09 13:29:39 -0500 |
| commit | 85ce230051c37dfb979385eb0244bf3655625ba6 (patch) | |
| tree | 90abeab25f8c1ea4836b38279790b90f0c780ae3 /drivers/gpu/drm/qxl/qxl_release.c | |
| parent | 538ea4aa44737127ce2b5c8511c7349d2abdcf9c (diff) | |
| parent | 209851649dc4f7900a6bfe1de5e2640ab2c7d931 (diff) | |
Merge branch 'for-4.4/hotplug' into libnvdimm-for-next
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; } |