| From 5697ef5816bc449009c5ccfd48c94b7814e38f55 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 18 Oct 2021 14:32:57 +0000 |
| Subject: cavium: Fix return values of the probe function |
| |
| From: Zheyu Ma <zheyuma97@gmail.com> |
| |
| [ Upstream commit c69b2f46876825c726bd8a97c7fa852d8932bc32 ] |
| |
| During the process of driver probing, the probe function should return < 0 |
| for failure, otherwise, the kernel will treat value > 0 as success. |
| |
| Signed-off-by: Zheyu Ma <zheyuma97@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/cavium/thunder/nicvf_main.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c |
| index 5c45c0c6dd234..27ea528ef4484 100644 |
| --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c |
| +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c |
| @@ -1226,7 +1226,7 @@ static int nicvf_register_misc_interrupt(struct nicvf *nic) |
| if (ret < 0) { |
| netdev_err(nic->netdev, |
| "Req for #%d msix vectors failed\n", nic->num_vec); |
| - return 1; |
| + return ret; |
| } |
| |
| sprintf(nic->irq_name[irq], "%s Mbox", "NICVF"); |
| @@ -1245,7 +1245,7 @@ static int nicvf_register_misc_interrupt(struct nicvf *nic) |
| if (!nicvf_check_pf_ready(nic)) { |
| nicvf_disable_intr(nic, NICVF_INTR_MBOX, 0); |
| nicvf_unregister_interrupts(nic); |
| - return 1; |
| + return -EIO; |
| } |
| |
| return 0; |
| -- |
| 2.33.0 |
| |
