diff --git a/hw/kdrive/ati/ati_draw.c b/hw/kdrive/ati/ati_draw.c
index a47dc8973..a6ea02521 100644
--- a/hw/kdrive/ati/ati_draw.c
+++ b/hw/kdrive/ati/ati_draw.c
@@ -568,6 +568,10 @@ ATIUploadToScreen(PixmapPtr pDst, char *src, int src_pitch)
 	RING_LOCALS;
 
 	ENTER_DRAW (pDst);
+
+	LEAVE_DRAW (pDst);
+	/* XXX: Hostdata uploads aren't working yet. */
+	return FALSE;
 	
 	dst_offset = ((CARD8 *)pDst->devPrivate.ptr -
 	    pScreenPriv->screen->memory_base);
@@ -595,11 +599,6 @@ ATIUploadToScreen(PixmapPtr pDst, char *src, int src_pitch)
 	if (atis->using_pio)
 		return FALSE;
 
-	LEAVE_DRAW (pDst);
-
-	/* XXX: Hostdata uploads aren't working yet. */
-	return FALSE;
-
 	dwords = (width * height * (bpp / 8) + 3) / 4;
 
 	/* Flush pixel cache so nothing being written to the destination