dpif: More consistently initialize dpifs in failure cases.

diff --git a/lib/dpif.c b/lib/dpif.c
index 0109cda466a98110113cc10ad8eb8804b4a85198..563149e4fad4d05463c69f54f1c514ab26db8034 100644 (file)
--- a/lib/dpif.c
+++ b/lib/dpif.c
@@ -149,7 +149,6 @@ dpif_create(const char *name, struct dpif *dpif)
 
     if (!get_minor_from_name(name, &minor)) {
         /* Minor was specified in 'name', go ahead and create it. */
-        dpif->fd = -1;
         error = open_by_minor(minor, dpif);
         if (error) {
             return error;
@@ -943,6 +942,8 @@ open_by_minor(unsigned int minor, struct dpif *dpif)
     char *fn;
     int fd;
 
+    dpif->minor = -1;
+    dpif->fd = -1;
     error = make_openflow_device(minor, &fn);
     if (error) {
         return error;