diff options
| author | Joerg Roedel <jroedel@suse.de> | 2020-06-30 11:32:02 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2020-06-30 11:32:02 +0200 |
| commit | 77346a704c913268a2dad68d59523fd85dc74088 (patch) | |
| tree | 62c66bcb163b0db42a1fd0a397a6973e52f4ddce /drivers/gpu/drm/virtio/virtgpu_object.c | |
| parent | 5bc1cf1466f635682c3e26eb4179541feeefb1be (diff) | |
| parent | 9ebcfadb0610322ac537dd7aa5d9cbc2b2894c68 (diff) | |
Merge tag 'v5.8-rc3' into arm/qcom
Linux 5.8-rc3
Diffstat (limited to 'drivers/gpu/drm/virtio/virtgpu_object.c')
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_object.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c index d9039bb7c5e3..6ccbd01cd888 100644 --- a/drivers/gpu/drm/virtio/virtgpu_object.c +++ b/drivers/gpu/drm/virtio/virtgpu_object.c @@ -235,13 +235,8 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev, return ret; } - ret = virtio_gpu_object_attach(vgdev, bo, ents, nents); - if (ret != 0) { - virtio_gpu_free_object(&shmem_obj->base); - return ret; - } + virtio_gpu_object_attach(vgdev, bo, ents, nents); - virtio_gpu_notify(vgdev); *bo_ptr = bo; return 0; |