Update the offset when read every debug entries info.

[mirror_edk2.git] / MdeModulePkg / Bus / Ata / AtaAtapiPassThru / AtaAtapiPassThru.c

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
index 526590718aa0e43fe2f2496103c7f6052eaed7ee..2494c6abf07e73eb020725b214e4e1569504adba 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
@@ -658,13 +658,11 @@ AtaAtapiPassThruStart (
   ATA_ATAPI_PASS_THRU_INSTANCE      *Instance;\r
   EFI_PCI_IO_PROTOCOL               *PciIo;\r
   UINT64                            Supports;\r
-  BOOLEAN                           PciAttributesSaved;\r
   UINT64                            OriginalPciAttributes;\r
 \r
   Status                = EFI_SUCCESS;\r
   IdeControllerInit     = NULL;\r
   Instance              = NULL;\r
-  PciAttributesSaved    = FALSE;\r
   OriginalPciAttributes = 0;\r
 \r
   DEBUG ((EFI_D_INFO, "==AtaAtapiPassThru Start== Controller = %x\n", Controller));\r
@@ -706,7 +704,6 @@ AtaAtapiPassThruStart (
   if (EFI_ERROR (Status)) {\r
     goto ErrorExit;\r
   }\r
-  PciAttributesSaved = TRUE;\r
 \r
   Status = PciIo->Attributes (\r
                     PciIo,\r
@@ -2031,7 +2028,8 @@ ExtScsiPassThruGetNextTargetLun (
 \r
       if ((DeviceInfo->Type == EfiIdeCdrom) &&\r
          ((Target8[0] < DeviceInfo->Port) || \r
-          (Target8[1] < DeviceInfo->PortMultiplier))) {\r
+          ((Target8[0] == DeviceInfo->Port) &&\r
+           (Target8[1] < DeviceInfo->PortMultiplier)))) {\r
         Target8[0] = (UINT8)DeviceInfo->Port;\r
         Target8[1] = (UINT8)DeviceInfo->PortMultiplier;\r
         goto Exit;\r
@@ -2369,7 +2367,8 @@ ExtScsiPassThruGetNextTarget (
 \r
       if ((DeviceInfo->Type == EfiIdeCdrom) &&\r
          ((Target8[0] < DeviceInfo->Port) || \r
-          (Target8[1] < DeviceInfo->PortMultiplier))) {\r
+          ((Target8[0] == DeviceInfo->Port) &&\r
+           (Target8[1] < DeviceInfo->PortMultiplier)))) {\r
         Target8[0] = (UINT8)DeviceInfo->Port;\r
         Target8[1] = (UINT8)DeviceInfo->PortMultiplier;\r
         goto Exit;\r