]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/virtio: Fix NULL vs IS_ERR checking in virtio_gpu_object_shmem_init
authorMiaoqian Lin <linmq006@gmail.com>
Thu, 2 Jun 2022 10:42:22 +0000 (14:42 +0400)
committerGerd Hoffmann <kraxel@redhat.com>
Thu, 9 Jun 2022 05:30:13 +0000 (07:30 +0200)
Since drm_prime_pages_to_sg() function return error pointers.
The drm_gem_shmem_get_sg_table() function returns error pointers too.
Using IS_ERR() to check the return value to fix this.

Fixes: e09df06efbe1 ("drm/virtio: move virtio_gpu_mem_entry initialization to new function")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20220602104223.54527-1-linmq006@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
drivers/gpu/drm/virtio/virtgpu_object.c

index f293e6ad52dafad4712e76f5619ff67c396a3ba4..1cc8f3fc8e4ba2951c093f813fab4bdf02aeae7d 100644 (file)
@@ -168,9 +168,9 @@ static int virtio_gpu_object_shmem_init(struct virtio_gpu_device *vgdev,
         * since virtio_gpu doesn't support dma-buf import from other devices.
         */
        shmem->pages = drm_gem_shmem_get_sg_table(&bo->base);
-       if (!shmem->pages) {
+       if (IS_ERR(shmem->pages)) {
                drm_gem_shmem_unpin(&bo->base);
-               return -EINVAL;
+               return PTR_ERR(shmem->pages);
        }
 
        if (use_dma_api) {