New upstream version 18.11.1

[deb_dpdk.git] / drivers / raw / ifpga_rawdev / ifpga_rawdev.c

diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
index 32e318f..da772d0 100644 (file)
--- a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
+++ b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
@@ -409,9 +409,10 @@ ifpga_rawdev_create(struct rte_pci_device *pci_dev,
        data->device_id = pci_dev->id.device_id;
        data->vendor_id = pci_dev->id.vendor_id;
 
+       adapter = rawdev->dev_private;
        /* create a opae_adapter based on above device data */
-       adapter = opae_adapter_alloc(pci_dev->device.name, data);
-       if (!adapter) {
+       ret = opae_adapter_init(adapter, pci_dev->device.name, data);
+       if (ret) {
                ret = -ENOMEM;
                goto free_adapter_data;
        }
@@ -420,12 +421,10 @@ ifpga_rawdev_create(struct rte_pci_device *pci_dev,
        rawdev->device = &pci_dev->device;
        rawdev->driver_name = pci_dev->device.driver->name;
 
-       rawdev->dev_private = adapter;
-
        /* must enumerate the adapter before use it */
        ret = opae_adapter_enumerate(adapter);
        if (ret)
-               goto free_adapter;
+               goto free_adapter_data;
 
        /* get opae_manager to rawdev */
        mgr = opae_adapter_get_mgr(adapter);
@@ -436,9 +435,6 @@ ifpga_rawdev_create(struct rte_pci_device *pci_dev,
 
        return ret;
 
-free_adapter:
-       if (adapter)
-               opae_adapter_free(adapter);
 free_adapter_data:
        if (data)
                opae_adapter_data_free(data);