diff --git a/drivers/network/afd/afd/write.c b/drivers/network/afd/afd/write.c
index c772e3fa1e0..b8406eb8e5a 100644
--- a/drivers/network/afd/afd/write.c
+++ b/drivers/network/afd/afd/write.c
@@ -264,22 +264,6 @@ AfdConnectedSocketWriteData(PDEVICE_OBJECT DeviceObject, PIRP Irp,
 	return UnlockAndMaybeComplete
 	    ( FCB, STATUS_NO_MEMORY, Irp, TotalBytesCopied, NULL );
 
-    AFD_DbgPrint(MID_TRACE,("Socket state %d\n", FCB->State));
-
-    if( FCB->State != SOCKET_STATE_CONNECTED ) {
-	if( SendReq->AfdFlags & AFD_IMMEDIATE ) {
-	    AFD_DbgPrint(MID_TRACE,("Nonblocking\n"));
-	    return UnlockAndMaybeComplete
-		( FCB, STATUS_CANT_WAIT, Irp, 0, NULL );
-	} else {
-	    AFD_DbgPrint(MID_TRACE,("Queuing request\n"));
-	    return LeaveIrpUntilLater( FCB, Irp, FUNCTION_SEND );
-	}
-    }
-
-    AFD_DbgPrint(MID_TRACE,("We already have %d bytes waiting.\n",
-			    FCB->Send.BytesUsed));
-
     SendReq->BufferArray = LockBuffers( SendReq->BufferArray,
 					SendReq->BufferCount,
 					NULL, NULL,
@@ -290,6 +274,20 @@ AfdConnectedSocketWriteData(PDEVICE_OBJECT DeviceObject, PIRP Irp,
                                        Irp, 0, NULL );
     }
 
+    AFD_DbgPrint(MID_TRACE,("Socket state %d\n", FCB->State));
+
+    if( FCB->State != SOCKET_STATE_CONNECTED ) {
+	if( SendReq->AfdFlags & AFD_IMMEDIATE ) {
+	    AFD_DbgPrint(MID_TRACE,("Nonblocking\n"));
+	    UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE );
+	    return UnlockAndMaybeComplete
+		( FCB, STATUS_CANT_WAIT, Irp, 0, NULL );
+	} else {
+	    AFD_DbgPrint(MID_TRACE,("Queuing request\n"));
+	    return LeaveIrpUntilLater( FCB, Irp, FUNCTION_SEND );
+	}
+    }
+
     AFD_DbgPrint(MID_TRACE,("FCB->Send.BytesUsed = %d\n",
 			    FCB->Send.BytesUsed));