diff --git a/src/qxl_driver.c b/src/qxl_driver.c
diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index 29b1551..aa969e8 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -749,8 +749,6 @@ qxl_screen_init (SCREEN_INIT_ARGS_DECL)
        }
     }

-    qxl->uxa = uxa_driver_alloc ();
-
 #ifndef XSPICE
     qxl->io_pages = (void *)((unsigned long)qxl->ram);
     qxl->io_pages_physical = (void *)((unsigned long)qxl->ram_physical);
diff --git a/src/qxl_uxa.c b/src/qxl_uxa.c
index 875d663..a8e620c 100644
--- a/src/qxl_uxa.c
+++ b/src/qxl_uxa.c
@@ -548,7 +548,7 @@ qxl_uxa_init (qxl_screen_t *qxl, ScreenPtr screen)

     qxl->uxa = uxa_driver_alloc ();
     if (qxl->uxa == NULL)
-       return FALSE;
+               return FALSE;

     memset (qxl->uxa, 0, sizeof (*qxl->uxa));