Commit 00e0719a authored by Xie Yongji's avatar Xie Yongji Committed by openeuler-sync-bot
Browse files

drm/virtio: free virtqueues on probe failure 

mainline inclusion
from mainline-v5.13-rc2
commit 	058acb33
category: bugfix
bugzilla: https://gitee.com/openeuler/stratovirt/issues/I66GGJ
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v5.15&id=058acb33d100c5cceab10d2dd388cf9bc0918908



--------------------------------

We should call virtio_gpu_deinit() to free virtqueues when
drm_dev_register() failed.

Signed-off-by: default avatarXie Yongji <xieyongji@bytedance.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20210517084913.403-3-xieyongji@bytedance.com


Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarBinfeng Wu <wubinfeng@huawei.com>
(cherry picked from commit f102b552)
parent 09bd9002

drivers/gpu/drm/virtio/virtgpu_drv.c

+3 −1
Original line number Diff line number Diff line
@@ -122,11 +122,13 @@ static int virtio_gpu_probe(struct virtio_device *vdev) 


	ret = drm_dev_register(dev, 0);

	if (ret)

		goto err_free;

		goto err_deinit;



	drm_fbdev_generic_setup(vdev->priv, 32);

	return 0;



err_deinit:

	virtio_gpu_deinit(dev);

err_free:

	drm_dev_put(dev);

	return ret;