[ros-diffs] [tfaber] 72485: [USBHUB] - Return the correct pointer when handling TargetDeviceRelation, and avoid unnecessarily allocating from NonPagedPool. Patch by Vardan Mikayelyan, merged from r72376.

Author: tfaber
Date: Sun Aug 28 10:52:40 2016
New Revision: 72485

URL: http://svn.reactos.org/svn/reactos?rev=72485&view=rev
Log:
[USBHUB]
- Return the correct pointer when handling TargetDeviceRelation, and avoid unnecessarily allocating from NonPagedPool. Patch by Vardan Mikayelyan, merged from r72376.

Modified:
    trunk/reactos/   (props changed)
    trunk/reactos/drivers/usb/usbhub/   (props changed)
    trunk/reactos/drivers/usb/usbhub/pdo.c

Propchange: trunk/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Aug 28 10:52:40 2016
@@ -1,7 +1,7 @@
 /branches/GSoC_2011/GSoC_Network:51548
 /branches/GSoC_2011/GSoC_TcpIpDriver:51550
 /branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119
-/branches/GSoC_2016/USB:72366
+/branches/GSoC_2016/USB:72366,72376
 /branches/GSoC_Network:51545-51546
 /branches/cmake-bringup:50484,50693,50719,51544-52564
 /branches/condrv_restructure:63104-65657

Propchange: trunk/reactos/drivers/usb/usbhub/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Aug 28 10:52:40 2016
@@ -4,7 +4,7 @@
 /branches/GSoC_2011/GSoC_TcpIpDriver/drivers/usb/usbhub_new:51550
 /branches/GSoC_2011/TcpIpDriver/drivers/usb/usbhub:51551-53074,53076-53119
 /branches/GSoC_2011/TcpIpDriver/drivers/usb/usbhub_new:51551-53074,53076-53119
-/branches/GSoC_2016/USB/drivers/usb/usbhub:72366
+/branches/GSoC_2016/USB/drivers/usb/usbhub:72366,72376
 /branches/GSoC_Network/drivers/usb/usbhub:51545-51546
 /branches/GSoC_Network/drivers/usb/usbhub_new:51545-51546
 /branches/cmake-bringup/drivers/usb/usbhub:50484,50693,50719,51544-52564

Modified: trunk/reactos/drivers/usb/usbhub/pdo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?re...
==============================================================================
--- trunk/reactos/drivers/usb/usbhub/pdo.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbhub/pdo.c	[iso-8859-1] Sun Aug 28 10:52:40 2016
@@ -703,7 +703,7 @@
             }

/* allocate device relations */
-            DeviceRelation = (PDEVICE_RELATIONS)ExAllocatePool(NonPagedPool, sizeof(DEVICE_RELATIONS));
+            DeviceRelation = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, sizeof(DEVICE_RELATIONS));
             if (!DeviceRelation)
             {
                 /* no memory */
@@ -717,7 +717,7 @@
             ObReferenceObject(DeviceRelation->Objects[0]);

/* store result */
-            Irp->IoStatus.Information = (ULONG_PTR)DeviceRelation;
+            Information = (ULONG_PTR)DeviceRelation;
             Status = STATUS_SUCCESS;
             break;
         }