pci: unmap resources if probe fails
authorBen Walker <benjamin.walker@intel.com>
Wed, 11 Jan 2017 17:10:10 +0000 (10:10 -0700)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Thu, 12 Jan 2017 14:47:45 +0000 (15:47 +0100)
If resources were mapped prior to probe, unmap them
if probe fails.

This does not handle the case where the kernel driver was
forcibly unbound prior to probe.

Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Acked-by: Shreyansh Jain <shreyansh.jain@nxp.com>
lib/librte_eal/common/eal_common_pci.c

index 33485bc..72547bd 100644 (file)
@@ -210,8 +210,11 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d
 
                /* call the driver probe() function */
                ret = dr->probe(dr, dev);
 
                /* call the driver probe() function */
                ret = dr->probe(dr, dev);
-               if (ret)
+               if (ret) {
                        dev->driver = NULL;
                        dev->driver = NULL;
+                       if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING)
+                               rte_eal_pci_unmap_device(dev);
+               }
 
                return ret;
        }
 
                return ret;
        }