diff --git a/drivers/network/afd/afd/main.c b/drivers/network/afd/afd/main.c
index 0270c4bede4..51116743c7b 100644
--- a/drivers/network/afd/afd/main.c
+++ b/drivers/network/afd/afd/main.c
@@ -313,6 +313,8 @@ AfdDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp)
 	ASSERT(FileObject == IrpSp->FileObject);
     }
 
+    Irp->IoStatus.Information = 0;
+
     switch(IrpSp->MajorFunction)
     {
 	/* opening and closing handles to the device */
@@ -457,7 +459,6 @@ AfdDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp)
 
 	default:
 	    Status = STATUS_NOT_IMPLEMENTED;
-	    Irp->IoStatus.Information = 0;
 	    AFD_DbgPrint(MIN_TRACE, ("Unknown IOCTL (0x%x)\n",
 				     IrpSp->Parameters.DeviceIoControl.
 				     IoControlCode));
diff --git a/drivers/network/afd/afd/select.c b/drivers/network/afd/afd/select.c
index 3f00167b134..109a519ade2 100644
--- a/drivers/network/afd/afd/select.c
+++ b/drivers/network/afd/afd/select.c
@@ -262,6 +262,8 @@ AfdSelect( PDEVICE_OBJECT DeviceObject, PIRP Irp,
 
     AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status));
 
+    Irp->IoStatus.Status = Status;
+
     return Status;
 }