diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index c24589414c75926b934b9bb117b237bcb686e736..0f36db0cf74a9c1bc8ad61e81b416da4b5d7a773 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -1063,6 +1063,8 @@ static int ace_setup(struct ace_device *ace)
 	return 0;
 
 err_read:
+	/* prevent double queue cleanup */
+	ace->gd->queue = NULL;
 	put_disk(ace->gd);
 err_alloc_disk:
 	blk_cleanup_queue(ace->queue);