2 files changed, 34 insertions, 29 deletions

diff --git a/drivers/net/octeontx/nicvf_main.c b/drivers/net/octeontx/nicvf_main.c
index 27d0327c88a..94e5d827614 100644
--- a/drivers/net/octeontx/nicvf_main.c
+++ b/drivers/net/octeontx/nicvf_main.c
@@ -232,7 +232,7 @@ static int nicvf_rcv_pkt_handler(struct nicvf *nic,
 
 	size_t pkt_len;
 	struct cqe_rx_t *cqe_rx = (struct cqe_rx_t *)cq_desc;
-	int err = 0;
+	int err;
 
 	/* Check for errors */
 	err = nicvf_check_cqe_rx_errs(nic, cq, cq_desc);
@@ -245,8 +245,7 @@ static int nicvf_rcv_pkt_handler(struct nicvf *nic,
 		return -1;
 	}
 
-	if (pkt)
-		*ppkt = pkt;
+	*ppkt = pkt;
 
 	return pkt_len;
 }
@@ -274,31 +273,29 @@ int nicvf_cq_handler(struct nicvf *nic, void **ppkt, int *pkt_len)
 	cqe_head >>= 9;
 	cqe_head &= 0xFFFF;
 
-	if (cqe_count) {
-		/* Get the CQ descriptor */
-		cq_desc = (struct cqe_rx_t *)GET_CQ_DESC(cq, cqe_head);
-		cqe_head++;
-		cqe_head &= (cq->dmem.q_len - 1);
-
-		switch (cq_desc->cqe_type) {
-		case CQE_TYPE_RX:
-			debug("%s: Got Rx CQE\n", nic->dev->name);
-			*pkt_len = nicvf_rcv_pkt_handler(nic, cq, cq_desc,
-							 ppkt, CQE_TYPE_RX);
-			processed_rq_cqe++;
-			break;
-		case CQE_TYPE_SEND:
-			debug("%s: Got Tx CQE\n", nic->dev->name);
-			nicvf_snd_pkt_handler(nic, cq, cq_desc, CQE_TYPE_SEND);
-			processed_sq_cqe++;
-			break;
-		default:
-			debug("%s: Got CQ type %u\n", nic->dev->name,
-			      cq_desc->cqe_type);
-			break;
-		}
-		processed_cqe++;
+	/* Get the CQ descriptor */
+	cq_desc = (struct cqe_rx_t *)GET_CQ_DESC(cq, cqe_head);
+	cqe_head++;
+	cqe_head &= (cq->dmem.q_len - 1);
+
+	switch (cq_desc->cqe_type) {
+	case CQE_TYPE_RX:
+		debug("%s: Got Rx CQE\n", nic->dev->name);
+		*pkt_len = nicvf_rcv_pkt_handler(nic, cq, cq_desc,
+						 ppkt, CQE_TYPE_RX);
+		processed_rq_cqe++;
+		break;
+	case CQE_TYPE_SEND:
+		debug("%s: Got Tx CQE\n", nic->dev->name);
+		nicvf_snd_pkt_handler(nic, cq, cq_desc, CQE_TYPE_SEND);
+		processed_sq_cqe++;
+		break;
+	default:
+		debug("%s: Got CQ type %u\n", nic->dev->name,
+		      cq_desc->cqe_type);
+		break;
 	}
+	processed_cqe++;
 
 	/* Dequeue CQE */
 	nicvf_queue_reg_write(nic, NIC_QSET_CQ_0_7_DOOR,
diff --git a/drivers/net/octeontx/smi.c b/drivers/net/octeontx/smi.c
index 233c26f7319..217bcac2ce2 100644
--- a/drivers/net/octeontx/smi.c
+++ b/drivers/net/octeontx/smi.c
@@ -338,7 +338,8 @@ int octeontx_smi_probe(struct udevice *dev)
 		if (!bus || !priv) {
 			printf("Failed to allocate OcteonTX MDIO bus # %u\n",
 			       dev_seq(dev));
-			return -1;
+			ret = -ENOMEM;
+			goto error_ret;
 		}
 
 		bus->read = octeontx_phy_read;
@@ -355,9 +356,16 @@ int octeontx_smi_probe(struct udevice *dev)
 
 		ret = mdio_register(bus);
 		if (ret)
-			return ret;
+			goto error_ret;
 	}
 	return 0;
+
+error_ret:
+	if (bus)
+		free(bus);
+	if (priv)
+		free(priv);
+	return ret;
 }
 
 static const struct udevice_id octeontx_smi_ids[] = {