MdeModulePkg: Fix a bug in GetNextTargetLun()/GetNextTarget() when two cdroms attached

Signed-off-by: erictian
Reviewed-by: rsun3
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12890 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
index 72196a00401b650cf42aae7a03be260ab2118ed2..2494c6abf07e73eb020725b214e4e1569504adba 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
@@ -2028,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
@@ -2366,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