From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88759C4332F for ; Mon, 25 Oct 2021 17:08:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6CD6160EE3 for ; Mon, 25 Oct 2021 17:08:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234506AbhJYRLL (ORCPT ); Mon, 25 Oct 2021 13:11:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:55836 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234685AbhJYREB (ORCPT ); Mon, 25 Oct 2021 13:04:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9A90360EE3; Mon, 25 Oct 2021 17:01:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635181287; bh=5qPsdk68LjakJts0qEi+dfamHVIL/23sxtmGWzxBCwE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZbBdoiwZ0gbKQk4rZ9Pa8WGxKhN8PeZ3dmKYdQbDaYjjJeHJattK94nNCgOxIuhWu IsmNJOxLE02lCf5/OWk0sOYGIb0TQC72y4pQoSy1xOj46tHiWIIVym5WDcBZ0kTMu5 IHrX8nO6mjLmUHt80SVlG/dwnfplej5Ogy58uUJiOqBMRrKWzKjnn2WWmvYhAuFFXK s1ohHle8aUTrycnOImfW+8DVWESA4jM60fcjjTxBuWsjnPpRfxfKLLlLfZA/fAkJBp clSDGiQ0rCxZfUhBOXws1LxmKd9+v1qxdV9H4JThDzYLk+dwtCMQM24kzsjXQknhts gN34bmKlzU9/Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zheyu Ma , "David S . Miller" , Sasha Levin , sgoutham@marvell.com, kuba@kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 4/7] cavium: Fix return values of the probe function Date: Mon, 25 Oct 2021 13:01:17 -0400 Message-Id: <20211025170120.1394792-4-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211025170120.1394792-1-sashal@kernel.org> References: <20211025170120.1394792-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Zheyu Ma [ 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 Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- 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 98734a37b6f6..df1c4ba7e0c9 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c @@ -1152,7 +1152,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"); @@ -1171,7 +1171,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