New upstream version 17.05.1

[deb_dpdk.git] / drivers / net / ark / ark_ethdev.c

diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c
index 995c93d..017817e 100644 (file)
--- a/drivers/net/ark/ark_ethdev.c
+++ b/drivers/net/ark/ark_ethdev.c
@@ -516,11 +516,7 @@ eth_ark_dev_uninit(struct rte_eth_dev *dev)
        dev->dev_ops = NULL;
        dev->rx_pkt_burst = NULL;
        dev->tx_pkt_burst = NULL;
-       if (dev->data->mac_addrs)
-               rte_free(dev->data->mac_addrs);
-       if (dev->data)
-               rte_free(dev->data);
-
+       rte_free(dev->data->mac_addrs);
        return 0;
 }
 
@@ -588,7 +584,11 @@ eth_ark_dev_start(struct rte_eth_dev *dev)
                /* Delay packet generatpr start allow the hardware to be ready
                 * This is only used for sanity checking with internal generator
                 */
-               pthread_create(&thread, NULL, delay_pg_start, ark);
+               if (pthread_create(&thread, NULL, delay_pg_start, ark)) {
+                       PMD_DRV_LOG(ERR, "Could not create pktgen "
+                                   "starter thread\n");
+                       return -1;
+               }
        }
 
        if (ark->user_ext.dev_start)
@@ -899,6 +899,12 @@ process_file_args(const char *key, const char *value, void *extra_args)
        int  size = 0;
        int first = 1;
 
+       if (file == NULL) {
+               PMD_DRV_LOG(ERR, "Unable to open "
+                           "config file %s\n", value);
+               return -1;
+       }
+
        while (fgets(line, sizeof(line), file)) {
                size += strlen(line);
                if (size >= ARK_MAX_ARG_LEN) {