From: Yuval Shaia <yuval.shaia@oracle.com>
Date: Tue, 11 Dec 2018 10:26:35 +0000 (+0200)
Subject: IB/mlx4: Remove unneeded NULL check
X-Git-Tag: Ubuntu-5.0.0-8.9~922^2~80
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2dd8e44cb4f3893f26ca29e9593450f289a0b48a;p=mirror_ubuntu-disco-kernel.git

IB/mlx4: Remove unneeded NULL check

NULL check for kfree is unnecessary, remove it.

Fixes: b42dde478bca ("IB/mlx4: Rework special QP creation error path")
Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
---

diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 0711ca1dfb8f..74ef7a0ec0b7 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -1211,10 +1211,10 @@ err_db:
 		mlx4_db_free(dev->dev, &qp->db);
 
 err:
-	if (sqp)
-		kfree(sqp);
-	else if (!*caller_qp)
+	if (!sqp && !*caller_qp)
 		kfree(qp);
+	kfree(sqp);
+
 	return err;
 }