diff options
| author |   Tony Lindgren <tony@atomide.com> | 2020-06-16 09:25:03 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-06-16 09:25:03 -0700 |
| commit | 07c7b547a79605f1041d55b84d91a4a4d9c5b363 (patch) | |
| tree | d98c1adacc8c65b475c325b427e54b8205b0013d /drivers/gpu/drm/virtio/virtgpu_object.c | |
| parent | Revert "bus: ti-sysc: Increase max softreset wait" (diff) | |
| parent | Linux 5.8-rc1 (diff) | |
| download | linux-dev-07c7b547a79605f1041d55b84d91a4a4d9c5b363.tar.xz linux-dev-07c7b547a79605f1041d55b84d91a4a4d9c5b363.zip | |
Merge tag 'v5.8-rc1' into fixes
Linux 5.8-rc1
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; |