IB/mlx5: Fix return value check in flow_counters_set_data()
authorweiyongjun (A) <weiyongjun1@huawei.com>
Thu, 7 Jun 2018 01:47:41 +0000 (01:47 +0000)
committerJason Gunthorpe <jgg@mellanox.com>
Mon, 11 Jun 2018 17:02:27 +0000 (11:02 -0600)
In case of error, the function mlx5_fc_create() returns ERR_PTR() and
never returns NULL. The NULL test in the return value check should be
replaced with IS_ERR().

Fixes: 3b3233fbf02e ("IB/mlx5: Add flow counters binding support")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
drivers/infiniband/hw/mlx5/main.c

index f93b30060ca7c4ed40eed4ced6c671a7b8c87335..645fc69997bc7422548857b411aa1ef63dc683e7 100644 (file)
@@ -3199,8 +3199,8 @@ static int flow_counters_set_data(struct ib_counters *ibcounters,
        if (!mcounters->hw_cntrs_hndl) {
                mcounters->hw_cntrs_hndl = mlx5_fc_create(
                        to_mdev(ibcounters->device)->mdev, false);
-               if (!mcounters->hw_cntrs_hndl) {
-                       ret = -ENOMEM;
+               if (IS_ERR(mcounters->hw_cntrs_hndl)) {
+                       ret = PTR_ERR(mcounters->hw_cntrs_hndl);
                        goto free;
                }
                hw_hndl = true;