octeontx2-pf: Fix an IS_ERR() vs NULL bug

Dan Carpenter · kuba-moo · commit 08ff78182fa1 · 2020-02-01T11:32:43.000-08:00
The otx2_mbox_get_rsp() function never returns NULL, it returns error pointers on error. Fixes: 34bfe0e ("octeontx2-pf: MTU, MAC and RX mode config support") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
@@ -171,9 +171,9 @@ static int otx2_hw_get_mac_addr(struct otx2_nic *pfvf,
 	}
 
 	msghdr = otx2_mbox_get_rsp(&pfvf->mbox.mbox, 0, &req->hdr);
-	if (!msghdr) {
+	if (IS_ERR(msghdr)) {
 		otx2_mbox_unlock(&pfvf->mbox);
-		return -ENOMEM;
+		return PTR_ERR(msghdr);
 	}
 	rsp = (struct nix_get_mac_addr_rsp *)msghdr;
 	ether_addr_copy(netdev->dev_addr, rsp->mac_addr);

Original file line number	Diff line number	Diff line change
`@@ -171,9 +171,9 @@ static int otx2_hw_get_mac_addr(struct otx2_nic *pfvf,`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`msghdr = otx2_mbox_get_rsp(&pfvf->mbox.mbox, 0, &req->hdr);`
`174`		`- if (!msghdr) {`
	`174`	`+ if (IS_ERR(msghdr)) {`
`175`	`175`	`otx2_mbox_unlock(&pfvf->mbox);`
`176`		`- return -ENOMEM;`
	`176`	`+ return PTR_ERR(msghdr);`
`177`	`177`	`}`
`178`	`178`	`rsp = (struct nix_get_mac_addr_rsp *)msghdr;`
`179`	`179`	`ether_addr_copy(netdev->dev_addr, rsp->mac_addr);`