From: Ján Tomko <jtomko@redhat.com>
Date: Fri, 3 Jun 2016 10:30:53 +0000 (+0200)
Subject: Do not call nodeStateCleanup on early initialization error
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c8afb4e1ec7e3480a160ae8058fd504970da6e6a;p=libvirt.git

Do not call nodeStateCleanup on early initialization error

If we have not allocated driver yet, there is nothing to cleanup.
---

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 1e11afe128..c2f503ddeb 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -1709,21 +1709,21 @@ static int nodeStateInitialize(bool privileged,
     int ret = -1;
 
     if (VIR_ALLOC(priv) < 0)
-        goto out;
+        return -1;
 
     priv->watch = -1;
     priv->privileged = privileged;
 
     if (VIR_ALLOC(driver) < 0) {
         VIR_FREE(priv);
-        goto out;
+        return -1;
     }
 
     if (virMutexInit(&driver->lock) < 0) {
         VIR_ERROR(_("Failed to initialize mutex for driver"));
         VIR_FREE(priv);
         VIR_FREE(driver);
-        goto out;
+        return -1;
     }
 
     nodeDeviceLock();
@@ -1785,7 +1785,6 @@ static int nodeStateInitialize(bool privileged,
  out_unlock:
     nodeDeviceUnlock();
 
- out:
     if (ret == -1)
         nodeStateCleanup();
     return ret;