net,IB/mlx: Bump all Mellanox driver versions

[deliverable/linux.git] / drivers / net / ethernet / mellanox / mlx5 / core / main.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index 40a9f5ed814dd16defab7915d4368266cd5fa1e4..23b7e2d35a93bb0598ac76b71d75cfc3ea7afff8 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -46,8 +46,8 @@
 #include "mlx5_core.h"
 
 #define DRIVER_NAME "mlx5_core"
-#define DRIVER_VERSION "1.0"
-#define DRIVER_RELDATE "June 2013"
+#define DRIVER_VERSION "2.2-1"
+#define DRIVER_RELDATE "Feb 2014"
 
 MODULE_AUTHOR("Eli Cohen <eli@mellanox.com>");
 MODULE_DESCRIPTION("Mellanox ConnectX-IB HCA core library");
@@ -460,7 +460,10 @@ disable_msix:
 
 err_stop_poll:
        mlx5_stop_health_poll(dev);
-       mlx5_cmd_teardown_hca(dev);
+       if (mlx5_cmd_teardown_hca(dev)) {
+               dev_err(&dev->pdev->dev, "tear_down_hca failed, skip cleanup\n");
+               return err;
+       }
 
 err_pagealloc_stop:
        mlx5_pagealloc_stop(dev);
@@ -503,7 +506,10 @@ void mlx5_dev_cleanup(struct mlx5_core_dev *dev)
        mlx5_eq_cleanup(dev);
        mlx5_disable_msix(dev);
        mlx5_stop_health_poll(dev);
-       mlx5_cmd_teardown_hca(dev);
+       if (mlx5_cmd_teardown_hca(dev)) {
+               dev_err(&dev->pdev->dev, "tear_down_hca failed, skip cleanup\n");
+               return;
+       }
        mlx5_pagealloc_stop(dev);
        mlx5_reclaim_startup_pages(dev);
        mlx5_core_disable_hca(dev);