1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c
index bb81e310eb6d..578d867a81d5 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.c
+++ b/drivers/gpu/drm/qxl/qxl_drv.c
@@ -79,6 +79,10 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (ret)
                 goto free_dev;
 
+        ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "qxl");
+        if (ret)
+                goto disable_pci;
+
         ret = qxl_device_init(qdev, &qxl_driver, pdev);
         if (ret)
                 goto disable_pci;
@@ -94,7 +98,6 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (ret)
                 goto modeset_cleanup;
 
-        drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "qxl");
         drm_fbdev_generic_setup(&qdev->ddev, 32);
         return 0;