Clean up the hard code offset in MdePkg BaseLib Ia32 Thunk16.S and EcpPkg GlueLib...

[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 3e135d74ec60068882c30d3a323faf88fb77ba6c..72196a00401b650cf42aae7a03be260ab2118ed2 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
@@ -794,7 +791,7 @@ ErrorExit:
            );\r
   }\r
 \r
-  if (Instance->TimerEvent != NULL) {\r
+  if ((Instance != NULL) && (Instance->TimerEvent != NULL)) {\r
     gBS->CloseEvent (Instance->TimerEvent);\r
   }\r
 \r