leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
The otx2_mbox_get_rsp() function never returns NULL, it returns error
pointers on error.

Fixes: 34bfe0ebed ("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>
This commit is contained in:
Dan Carpenter 2020-01-31 08:02:41 +03:00 committed by Jakub Kicinski
parent 784f8344de
commit 08ff78182f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
View File

@ -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); msghdr = otx2_mbox_get_rsp(&pfvf->mbox.mbox, 0, &req->hdr);
if (!msghdr) { if (IS_ERR(msghdr)) {
otx2_mbox_unlock(&pfvf->mbox); otx2_mbox_unlock(&pfvf->mbox);
return -ENOMEM; return PTR_ERR(msghdr);
} }
rsp = (struct nix_get_mac_addr_rsp *)msghdr; rsp = (struct nix_get_mac_addr_rsp *)msghdr;
ether_addr_copy(netdev->dev_addr, rsp->mac_addr); ether_addr_copy(netdev->dev_addr, rsp->mac_addr);