From 9e09761b43179caa3bc825a83b18e3b27ddf7f10 Mon Sep 17 00:00:00 2001 From: Gaetan Rivet Date: Tue, 28 Mar 2017 16:13:11 +0200 Subject: [PATCH] net/mlx4: fix returned values upon failed probing Let error messages in place, but return unambiguous values upon probing errors. Fixes: 66e1591687ac ("mlx4: avoid init errors when kernel modules are not loaded") Cc: stable@dpdk.org Signed-off-by: Gaetan Rivet Acked-by: Adrien Mazarguil --- drivers/net/mlx4/mlx4.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 45b52692d5..ff903e6819 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -5524,10 +5524,8 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) list = ibv_get_device_list(&i); if (list == NULL) { assert(errno); - if (errno == ENOSYS) { - WARN("cannot list devices, is ib_uverbs loaded?"); - return 0; - } + if (errno == ENOSYS) + ERROR("cannot list devices, is ib_uverbs loaded?"); return -errno; } assert(i >= 0); @@ -5559,11 +5557,11 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) ibv_free_device_list(list); switch (err) { case 0: - WARN("cannot access device, is mlx4_ib loaded?"); - return 0; + ERROR("cannot access device, is mlx4_ib loaded?"); + return -ENODEV; case EINVAL: - WARN("cannot use device, are drivers up to date?"); - return 0; + ERROR("cannot use device, are drivers up to date?"); + return -EINVAL; } assert(err > 0); return -err; -- 2.20.1