New upstream version 18.11

[deb_dpdk.git] / lib / librte_eal / common / eal_common_dev.c

diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c
index 1fdc9ab..fd7f5ca 100644 (file)
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -166,18 +166,20 @@ local_dev_probe(const char *devargs, struct rte_device **new_dev)
                ret = -ENODEV;
                goto err_devarg;
        }
+       /* Since there is a matching device, it is now its responsibility
+        * to manage the devargs we've just inserted. From this point
+        * those devargs shouldn't be removed manually anymore.
+        */
 
        ret = dev->bus->plug(dev);
-       if (ret) {
-               if (rte_dev_is_probed(dev)) /* if already succeeded earlier */
-                       return ret; /* no rollback */
+       if (ret && !rte_dev_is_probed(dev)) { /* if hasn't ever succeeded */
                RTE_LOG(ERR, EAL, "Driver cannot attach the device (%s)\n",
                        dev->name);
-               goto err_devarg;
+               return ret;
        }
 
        *new_dev = dev;
-       return 0;
+       return ret;
 
 err_devarg:
        if (rte_devargs_remove(da) != 0) {