Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7509c60b authored by Zheyu Ma's avatar Zheyu Ma Committed by Greg Kroah-Hartman
Browse files

cavium: Fix return values of the probe function 



[ 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: default avatarZheyu Ma <zheyuma97@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 908f6c2e

drivers/net/ethernet/cavium/thunder/nicvf_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1223,7 +1223,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");
@@ -1242,7 +1242,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;