Author: tfaber
Date: Mon May 29 09:23:33 2017
New Revision: 74696
URL:
http://svn.reactos.org/svn/reactos?rev=74696&view=rev
Log:
[ACPI]
- Remove some dead code in acpi_system_add. CID 502179
- Define deviceName only in debug builds in Bus_AddDevice. CID 502180
Modified:
trunk/reactos/drivers/bus/acpi/busmgr/system.c
trunk/reactos/drivers/bus/acpi/main.c
Modified: trunk/reactos/drivers/bus/acpi/busmgr/system.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/sy…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] Mon May 29 09:23:33 2017
@@ -65,7 +65,6 @@
acpi_system_add (
struct acpi_device *device)
{
- int result = 0;
ACPI_STATUS status = AE_OK;
struct acpi_system *system = NULL;
UINT8 i = 0;
@@ -114,10 +113,7 @@
// }
//#endif
- if (result)
- ExFreePoolWithTag(system, 'IPCA');
-
- return_VALUE(result);
+ return_VALUE(0);
}
static int
Modified: trunk/reactos/drivers/bus/acpi/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/main.c?re…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] Mon May 29 09:23:33 2017
@@ -37,8 +37,8 @@
NTSTATUS status;
PDEVICE_OBJECT deviceObject = NULL;
PFDO_DEVICE_DATA deviceData = NULL;
+#ifndef NDEBUG
PWCHAR deviceName = NULL;
-#ifndef NDEBUG
ULONG nameLength;
#endif
@@ -159,9 +159,11 @@
deviceObject->Flags &= ~DO_DEVICE_INITIALIZING;
End:
+#ifndef NDEBUG
if (deviceName){
ExFreePoolWithTag(deviceName, 'MpcA');
}
+#endif
if (!NT_SUCCESS(status) && deviceObject){
if (deviceData && deviceData->NextLowerDriver){
IoDetachDevice (deviceData->NextLowerDriver);