summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunil Goutham <sgoutham@marvell.com>2021-07-22 18:15:51 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-08-04 12:47:57 +0200
commitd92d15c288413661e43542f0c2ac478e9d8e5de6 (patch)
tree545b2c0faed63a7a8f0e176485b25802cdc35444
parent187463c4a262fb010d6b240c09cedfe780aac580 (diff)
downloadlinux-stable-d92d15c288413661e43542f0c2ac478e9d8e5de6.tar.gz
linux-stable-d92d15c288413661e43542f0c2ac478e9d8e5de6.tar.bz2
linux-stable-d92d15c288413661e43542f0c2ac478e9d8e5de6.zip
octeontx2-af: Remove unnecessary devm_kfree
commit d72e91efcae12f2f24ced984d00d60517c677857 upstream. Remove devm_kfree of memory where VLAN entry to RVU PF mapping info is saved. This will be freed anyway at driver exit. Having this could result in warning from devm_kfree() if the memory is not allocated due to errors in rvu_nix_block_init() before nix_setup_txvlan(). Fixes: 9a946def264d ("octeontx2-af: Modify nix_vtag_cfg mailbox to support TX VTAG entries") Signed-off-by: Sunil Goutham <sgoutham@marvell.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
index 0a8bd667cb11..61ab4fdee73a 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
@@ -3587,7 +3587,6 @@ static void rvu_nix_block_freemem(struct rvu *rvu, int blkaddr,
vlan = &nix_hw->txvlan;
kfree(vlan->rsrc.bmap);
mutex_destroy(&vlan->rsrc_lock);
- devm_kfree(rvu->dev, vlan->entry2pfvf_map);
mcast = &nix_hw->mcast;
qmem_free(rvu->dev, mcast->mce_ctx);