octeontx2-pf: Fix error return code in otx2_probe()
PATCH 1/1 octeontx2-pf: Fix error return code in otx2_probe()
Fix to return negative error code -ENOMEM from the error handling case instead of 0, as done elsewhere in this function.
Fixes 5a6d7c9daef3 ("octeontx2-pf: Mailbox communication with AF")
Signed-off-by Wei Yongjun <[email protected]>
--- drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +6 -2
@@ -1856,13 +1856,17 @@ static int otx2_probe(struct pci_dev *pdev, const struct pci_device_id *id) num_vec =pci_msix_vec_count (pdev); hw->irq_name =devm_kmalloc_array (&hw->pdev->dev, num_vec,NAME_SIZE ,GFP_KERNEL ); -if (!hw->irq_name) +if (!hw->irq_name) { + err = -ENOMEM ; goto err_free_netdev; + } hw->affinity_mask =devm_kcalloc (&hw->pdev->dev, num_vec,sizeof (cpumask_var_t),GFP_KERNEL ); -if (!hw->affinity_mask) +if (!hw->affinity_mask) { + err = -ENOMEM ; goto err_free_netdev; + }/* Map CSRs */ pf->reg_base =pcim_iomap (pdev,PCI_CFG_REG_BAR_NUM ,0 );
From: Wei Yongjun <[email protected]>
Date: Mon, 27 Apr 2020 12:11:10 +0000
Quoted 5 lines
Fix to return negative error code
-ENOMEMfrom the error handling case instead of 0, as done elsewhere in this function.Fixes 5a6d7c9daef3 ("octeontx2-pf: Mailbox communication with AF")Signed-off-by Wei Yongjun <[email protected]>
Applied, thanks.