diff mbox

[ovs-dev,v2] datapath-windows: cleanup after NdisRegisterDeviceEx()

Message ID 1459895901-34730-1-git-send-email-nithin@vmware.com
State Superseded
Headers show

Commit Message

Nithin Raju April 5, 2016, 10:38 p.m. UTC 
The error handling code seems to be wrong.

Signed-off-by: Nithin Raju <nithin@vmware.com>
---
 datapath-windows/ovsext/Datapath.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
diff mbox

Patch

diff --git a/datapath-windows/ovsext/Datapath.c b/datapath-windows/ovsext/Datapath.c
index 464fa97..dc6baaa 100644
--- a/datapath-windows/ovsext/Datapath.c
+++ b/datapath-windows/ovsext/Datapath.c
@@ -456,18 +456,10 @@  OvsCreateDeviceObject(NDIS_HANDLE ovsExtDriverHandle)
                                   &deviceAttributes,
                                   &gOvsDeviceObject,
                                   &gOvsDeviceHandle);
-    if (status != NDIS_STATUS_SUCCESS) {
-        POVS_DEVICE_EXTENSION ovsExt =
-            (POVS_DEVICE_EXTENSION)NdisGetDeviceReservedExtension(gOvsDeviceObject);
-        ASSERT(gOvsDeviceObject != NULL);
-        ASSERT(gOvsDeviceHandle != NULL);
-
-        if (ovsExt) {
-            ovsExt->numberOpenInstance = 0;
-        }
-    } else {
+    if (status == NDIS_STATUS_SUCCESS) {
         OvsRegisterSystemProvider((PVOID)gOvsDeviceObject);
     }
+    ASSERT(status == NDIS_STATUS_SUCCESS || gOvsDeviceObject == NULL);
 
     OVS_LOG_TRACE("DeviceObject: %p", gOvsDeviceObject);
     return status;