X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FBus%2FScsi%2FScsiDiskDxe%2FScsiDisk.c;h=fd63857a5e29db96b90ec27c9527edfedc5ad55c;hp=3f6963ef198e41543158df291175c8677e0acfc2;hb=fcf5e49dc912f27b77b50ddea3c6b7a4ba28717c;hpb=fd776d390d63926dad53fb8addcfdbfc76f793b0

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index 3f6963ef19..fd63857a5e 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -1,7 +1,7 @@
 /** @file
   SCSI disk driver that layers on every SCSI IO protocol in the system.
 
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -454,17 +454,8 @@ ScsiDiskReadBlocks (
   BOOLEAN             MediaChange;
   EFI_TPL             OldTpl;
 
-  MediaChange = FALSE;
-  if (Buffer == NULL) {
-    return EFI_INVALID_PARAMETER;
-  }
-
-  if (BufferSize == 0) {
-    return EFI_SUCCESS;
-  }
-
-  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
-
+  MediaChange    = FALSE;
+  OldTpl         = gBS->RaiseTPL (TPL_CALLBACK);
   ScsiDiskDevice = SCSI_DISK_DEV_FROM_THIS (This);
 
   if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {
@@ -502,6 +493,16 @@ ScsiDiskReadBlocks (
     goto Done;
   }
 
+  if (Buffer == NULL) {
+    Status = EFI_INVALID_PARAMETER;
+    goto Done;
+  }
+
+  if (BufferSize == 0) {
+    Status = EFI_SUCCESS;
+    goto Done;
+  }
+
   if (BufferSize % BlockSize != 0) {
     Status = EFI_BAD_BUFFER_SIZE;
     goto Done;
@@ -569,17 +570,8 @@ ScsiDiskWriteBlocks (
   BOOLEAN             MediaChange;
   EFI_TPL             OldTpl;
 
-  MediaChange = FALSE;
-  if (Buffer == NULL) {
-    return EFI_INVALID_PARAMETER;
-  }
-
-  if (BufferSize == 0) {
-    return EFI_SUCCESS;
-  }
-
-  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
-
+  MediaChange    = FALSE;
+  OldTpl         = gBS->RaiseTPL (TPL_CALLBACK);
   ScsiDiskDevice = SCSI_DISK_DEV_FROM_THIS (This);
 
   if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {
@@ -617,6 +609,16 @@ ScsiDiskWriteBlocks (
     goto Done;
   }
 
+  if (BufferSize == 0) {
+    Status = EFI_SUCCESS;
+    goto Done;
+  }
+
+  if (Buffer == NULL) {
+    Status = EFI_INVALID_PARAMETER;
+    goto Done;
+  }
+
   if (BufferSize % BlockSize != 0) {
     Status = EFI_BAD_BUFFER_SIZE;
     goto Done;