提交 f102b552 编写于 作者: X Xie Yongji 提交者: wubinfeng

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: NXie Yongji <xieyongji@bytedance.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20210517084913.403-3-xieyongji@bytedance.comSigned-off-by: NGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: NBinfeng Wu <wubinfeng@huawei.com>
上级 41167b93
...@@ -122,11 +122,13 @@ static int virtio_gpu_probe(struct virtio_device *vdev) ...@@ -122,11 +122,13 @@ static int virtio_gpu_probe(struct virtio_device *vdev)
ret = drm_dev_register(dev, 0); ret = drm_dev_register(dev, 0);
if (ret) if (ret)
goto err_free; goto err_deinit;
drm_fbdev_generic_setup(vdev->priv, 32); drm_fbdev_generic_setup(vdev->priv, 32);
return 0; return 0;
err_deinit:
virtio_gpu_deinit(dev);
err_free: err_free:
drm_dev_put(dev); drm_dev_put(dev);
return ret; return ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册