octeontx2-pf: Fix error return code in otx2_probe() (654cad8b) · Commits · 戴 / test

Fix to return negative error code -ENOMEM from the error handling case instead of 0, as done elsewhere in this function. Fixes: ("octeontx2-pf: Mailbox communication with AF") Signed-off-by:

Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message