[IBAL] A fix to the pnp mechanism, don't remove the bus on query remove.

git-svn-id: svn://openib.tc.cornell.edu/gen1@1703 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/WOF2-0/trunk/core/bus/kernel/bus_pnp.c b/branches/WOF2-0/trunk/core/bus/kernel/bus_pnp.c
index 661d5d39107e1b5f63efdd915336f794c3a6c541..c5cb4371362bba06939fa2bdc179d923a7f0c70c 100644 (file)
--- a/branches/WOF2-0/trunk/core/bus/kernel/bus_pnp.c
+++ b/branches/WOF2-0/trunk/core/bus/kernel/bus_pnp.c
@@ -428,13 +428,6 @@ fdo_query_remove(
 \r
        //TODO: Fail outstanding I/O operations.\r
 \r
-       if ( p_ext->p_port_mgr && p_bfi->p_port_mgr )\r
-               cl_obj_destroy( &p_ext->p_port_mgr->obj );\r
-\r
-       if ( p_ext->p_iou_mgr && p_bfi->p_iou_mgr )\r
-               cl_obj_destroy( &p_ext->p_iou_mgr->obj );\r
-\r
-\r
        *p_action = IrpSkip;\r
        /* The FDO driver must set the status even when passing down. */\r
        p_irp->IoStatus.Status = STATUS_SUCCESS;\r
@@ -468,11 +461,15 @@ fdo_release_resources(
 \r
        //TODO: Fail outstanding I/O operations.\r
 \r
-       if ( p_ext->p_port_mgr && p_bfi->p_port_mgr )\r
+       if ( p_ext->p_port_mgr && p_bfi->p_port_mgr ) {\r
                cl_obj_destroy( &p_ext->p_port_mgr->obj );\r
+               p_ext->p_port_mgr = NULL;\r
+       }\r
 \r
-       if ( p_ext->p_iou_mgr && p_bfi->p_iou_mgr )\r
+       if ( p_ext->p_iou_mgr && p_bfi->p_iou_mgr ) {\r
                cl_obj_destroy( &p_ext->p_iou_mgr->obj );\r
+               p_ext->p_iou_mgr = NULL;\r
+       }\r
 \r
        BUS_PRINT( BUS_DBG_PNP, ("Releasing BusFilter %s\n", p_bfi->whoami ));\r
        if (p_bfi) {\r