* [PATCH net-next] octeontx2-vf: Fix error return code in otx2vf_probe()
@ 2020-05-08 2:15 ` Wei Yongjun
0 siblings, 0 replies; 4+ messages in thread
From: Wei Yongjun @ 2020-05-08 2:15 UTC (permalink / raw)
To: Sunil Goutham, Geetha sowjanya, Subbaraya Sundeep, hariprasad,
Tomasz Duszynski
Cc: Wei Yongjun, netdev, kernel-janitors, Hulk Robot
Fix to return negative error code -ENOMEM from the alloc failed error
handling case instead of 0, as done elsewhere in this function.
Fixes: 3184fb5ba96e ("octeontx2-vf: Virtual function driver support")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
index 187c633a7af5..f4227517dc8e 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
@@ -497,13 +497,17 @@ static int otx2vf_probe(struct pci_dev *pdev, const struct pci_device_id *id)
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;
+ }
err = pci_alloc_irq_vectors(hw->pdev, num_vec, num_vec, PCI_IRQ_MSIX);
if (err < 0) {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net-next] octeontx2-vf: Fix error return code in otx2vf_probe()
@ 2020-05-08 2:15 ` Wei Yongjun
0 siblings, 0 replies; 4+ messages in thread
From: Wei Yongjun @ 2020-05-08 2:15 UTC (permalink / raw)
To: Sunil Goutham, Geetha sowjanya, Subbaraya Sundeep, hariprasad,
Tomasz Duszynski
Cc: Wei Yongjun, netdev, kernel-janitors, Hulk Robot
Fix to return negative error code -ENOMEM from the alloc failed error
handling case instead of 0, as done elsewhere in this function.
Fixes: 3184fb5ba96e ("octeontx2-vf: Virtual function driver support")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
index 187c633a7af5..f4227517dc8e 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
@@ -497,13 +497,17 @@ static int otx2vf_probe(struct pci_dev *pdev, const struct pci_device_id *id)
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;
+ }
err = pci_alloc_irq_vectors(hw->pdev, num_vec, num_vec, PCI_IRQ_MSIX);
if (err < 0) {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] octeontx2-vf: Fix error return code in otx2vf_probe()
2020-05-08 2:15 ` Wei Yongjun
@ 2020-05-09 5:23 ` Jakub Kicinski
-1 siblings, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2020-05-09 5:23 UTC (permalink / raw)
To: Wei Yongjun
Cc: Sunil Goutham, Geetha sowjanya, Subbaraya Sundeep, hariprasad,
Tomasz Duszynski, netdev, kernel-janitors, Hulk Robot
On Fri, 8 May 2020 02:15:19 +0000 Wei Yongjun wrote:
> Fix to return negative error code -ENOMEM from the alloc failed error
> handling case instead of 0, as done elsewhere in this function.
>
> Fixes: 3184fb5ba96e ("octeontx2-vf: Virtual function driver support")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Applied, thank you!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] octeontx2-vf: Fix error return code in otx2vf_probe()
@ 2020-05-09 5:23 ` Jakub Kicinski
0 siblings, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2020-05-09 5:23 UTC (permalink / raw)
To: Wei Yongjun
Cc: Sunil Goutham, Geetha sowjanya, Subbaraya Sundeep, hariprasad,
Tomasz Duszynski, netdev, kernel-janitors, Hulk Robot
On Fri, 8 May 2020 02:15:19 +0000 Wei Yongjun wrote:
> Fix to return negative error code -ENOMEM from the alloc failed error
> handling case instead of 0, as done elsewhere in this function.
>
> Fixes: 3184fb5ba96e ("octeontx2-vf: Virtual function driver support")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Applied, thank you!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-05-09 5:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-08 2:15 [PATCH net-next] octeontx2-vf: Fix error return code in otx2vf_probe() Wei Yongjun
2020-05-08 2:15 ` Wei Yongjun
2020-05-09 5:23 ` Jakub Kicinski
2020-05-09 5:23 ` Jakub Kicinski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.