[next] octeontx2-pf: Fix assigned error return value that is never used

Commit Message

Colin King July 6, 2021, 11:18 a.m. UTC

From: Colin Ian King <[e-mail]>

Currently when the call to otx2_mbox_alloc_msg_cgx_mac_addr_update fails
the error return variable rc is being assigned -ENOMEM and does not
return early. rc is then re-assigned and the error case is not handled
correctly. Fix this by returning -ENOMEM rather than assigning rc.

Addresses-Coverity: ("Unused value")
Fixes: 79d2be385e9e ("octeontx2-pf: offload DMAC filters to CGX/RPM block")
Signed-off-by: Colin Ian King <[e-mail]>
---
 drivers/net/ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

[e-mail] July 6, 2021, 10:30 p.m. UTC | #1

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Tue,  6 Jul 2021 12:18:02 +0100 you wrote:
> From: Colin Ian King <[e-mail]>
> 
> Currently when the call to otx2_mbox_alloc_msg_cgx_mac_addr_update fails
> the error return variable rc is being assigned -ENOMEM and does not
> return early. rc is then re-assigned and the error case is not handled
> correctly. Fix this by returning -ENOMEM rather than assigning rc.
> 
> [...]

Here is the summary with links:
  - [next] octeontx2-pf: Fix assigned error return value that is never used
    https://git.kernel.org/netdev/net/c/ad1f37970875

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Patch

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c
index ffe3e94562d0..383a6b5cb698 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c
@@ -161,7 +161,7 @@  int otx2_dmacflt_update(struct otx2_nic *pf, u8 *mac, u8 bit_pos)
 
 	if (!req) {
 		mutex_unlock(&pf->mbox.lock);
-		rc = -ENOMEM;
+		return -ENOMEM;
 	}
 
 	ether_addr_copy(req->mac_addr, mac);