Auto-Merge pull request #2562 from octo/cid/179233

Automatically merged due to "Automerge" label

diff --git a/src/utils_ovs.c b/src/utils_ovs.c
index ae82253..3c448e3 100644 (file)
--- a/src/utils_ovs.c
+++ b/src/utils_ovs.c
@@ -1003,9 +1003,10 @@ ovs_db_t *ovs_db_init(const char *node, const char *service,
     return NULL;
 
   /* allocate db data & fill it */
-  ovs_db_t *pdb = pdb = calloc(1, sizeof(*pdb));
+  ovs_db_t *pdb = calloc(1, sizeof(*pdb));
   if (pdb == NULL)
     return NULL;
+  pdb->sock = -1;
 
   /* store the OVS DB address */
   sstrncpy(pdb->node, node, sizeof(pdb->node));
@@ -1047,7 +1048,6 @@ ovs_db_t *ovs_db_init(const char *node, const char *service,
   }
 
   /* init polling thread */
-  pdb->sock = -1;
   if (ovs_db_poll_thread_init(pdb) < 0) {
     ovs_db_destroy(pdb);
     return NULL;