diff --git a/src/picture.c b/src/picture.c
index 557180b..24de480 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -254,7 +254,6 @@ VAStatus sunxi_cedrus_EndPicture(VADriverContextP ctx, VAContextID context)
 		return VA_STATUS_ERROR_UNKNOWN;
 	}
 
-	assert(ioctl(request_fd, MEDIA_REQUEST_IOC_SUBMIT, NULL)==0);
 
 	/* For now, assume that we are done with rendering right away */
 	obj_context->current_render_target = -1;
diff --git a/src/surface.c b/src/surface.c
index ea234de..813cf0c 100644
--- a/src/surface.c
+++ b/src/surface.c
@@ -181,6 +181,8 @@ VAStatus sunxi_cedrus_SyncSurface(VADriverContextP ctx,
 	if(request_fd < 0)
 		return  VA_STATUS_ERROR_UNKNOWN;
 
+	assert(ioctl(request_fd, MEDIA_REQUEST_IOC_SUBMIT, NULL)==0);
+
 	FD_ZERO(&read_fds);
 	FD_SET(request_fd, &read_fds);