diff --git a/drivers/usb/usbstor/error.c b/drivers/usb/usbstor/error.c
index 91e25ba322f..386d2ebc130 100644
--- a/drivers/usb/usbstor/error.c
+++ b/drivers/usb/usbstor/error.c
@@ -134,7 +134,7 @@ USBSTOR_HandleTransferError(
 		//
 		Request = (PSCSI_REQUEST_BLOCK)Stack->Parameters.Others.Argument1;
 		DPRINT1("Retrying\n");
-		Status = USBSTOR_HandleExecuteSCSI(DeviceObject, Context->Irp, Request, Context->PDODeviceExtension);
+		Status = USBSTOR_HandleExecuteSCSI(DeviceObject, Context->Irp);
 	}
 	
 	DPRINT1("USBSTOR_HandleTransferError returning with Status %x\n", Status);
diff --git a/drivers/usb/usbstor/fdo.c b/drivers/usb/usbstor/fdo.c
index 8251ec54c66..2bca8ac7824 100644
--- a/drivers/usb/usbstor/fdo.c
+++ b/drivers/usb/usbstor/fdo.c
@@ -244,6 +244,7 @@ USBSTOR_FdoHandleStartDevice(
 
     }while(Index < DeviceExtension->MaxLUN);
 
+#if 0
     //
     // finally get usb device interface
     //
@@ -253,9 +254,10 @@ USBSTOR_FdoHandleStartDevice(
         //
         // failed to device interface
         //
-        DPRINT1("USBSTOR_FdoHandleStartDevice failed to device interface %x\n", Status);
+        DPRINT1("USBSTOR_FdoHandleStartDevice failed to get device interface %x\n", Status);
         return Status;
     }
+#endif
 
     //
     // fdo is now initialized
@@ -306,11 +308,10 @@ USBSTOR_FdoHandlePnp(
        case IRP_MN_QUERY_CAPABILITIES:
        {
            //
-           // just forward irp to lower device
+           // FIXME: set custom capabilities 
            //
-           //IoSkipCurrentIrpStackLocation(Irp);
-           Status = USBSTOR_SyncForwardIrp(DeviceExtension->LowerDeviceObject, Irp);
-           break;
+           IoSkipCurrentIrpStackLocation(Irp);
+           return IoCallDriver(DeviceExtension->LowerDeviceObject, Irp);
        }
        case IRP_MN_START_DEVICE:
        {